am d04af00b: am 77f55c5c: Merge "Fix build" into mnc-dev
am d04af00b: am 77f55c5c: Merge "Fix build" into mnc-dev

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