am e836a229: Fix build.
am e836a229: Fix build.

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