am 7f6c99df: Merge "fix build" into lmp-dev
am 7f6c99df: Merge "fix build" into lmp-dev

* commit '7f6c99df4a1c1829a7bf40d5f19c041db9926b98':
  fix build

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base