am 2885c6ba: Merge "Fix build" into lmp-mr1-dev
am 2885c6ba: Merge "Fix build" into lmp-mr1-dev

* commit '2885c6ba63850d5fd061460683de768617ed6b31':
  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