am 5cdaf8c3: Merge "Fix build" into klp-dev
am 5cdaf8c3: Merge "Fix build" into klp-dev

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