am 5d1811a9: am cf3eca2e: am 98ae4dfb: Fix build
am 5d1811a9: am cf3eca2e: am 98ae4dfb: Fix build

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