am 3d14b1a1: am 1e914ac7: am 16cc72bd: Fix simulator build.
am 3d14b1a1: am 1e914ac7: am 16cc72bd: Fix simulator build.

Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123'

* commit '3d14b1a17066b57b579859c246da1397f4e0a123':
  Fix simulator 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