am aaea8e54: Fixes the build.
am aaea8e54: Fixes the build.

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