Bug: 30681529 Test: make framework builds successfully Change-Id: I796cae6646dc42183c6502fc393dd44f174ee73f