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

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