am 21ec73d7: am 933a7546: Fix build
am 21ec73d7: am 933a7546: Fix build

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