am 91132c4e: Merge "Fix build"
am 91132c4e: Merge "Fix build"

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