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

Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp

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