am be19df0a: Fix the build
am be19df0a: Fix the build

Merge commit 'be19df0a4dcc5c9f2214935cfe6504df18be8697'

* commit 'be19df0a4dcc5c9f2214935cfe6504df18be8697':
  Fix the 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