am a1180f7b: am 5627b521: Merge "fix build" into klp-modular-dev
am a1180f7b: am 5627b521: Merge "fix build" into klp-modular-dev

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