am 856ff425: am 2b543d34: am 7f6c99df: Merge "fix build" into lmp-dev
am 856ff425: am 2b543d34: am 7f6c99df: Merge "fix build" into lmp-dev

* commit '856ff4253eece6a46c2b6725cb13f8fb46857899':
  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