am 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev
am 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev

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