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

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