am 95b1bbfe: Merge "Fix the build" into klp-dev
am 95b1bbfe: Merge "Fix the build" into klp-dev

* commit '95b1bbfe6c8fe5072d80e027d4b25319ed6f0411':
  Fix the 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