am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev
am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev

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