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

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