am 6474811d: Fix sim-eng build.
am 6474811d: Fix sim-eng build.

Merge commit '6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp

* commit '6474811d646153aeab111c1c0586b6ee53dcb0d2':
  Fix sim-eng build.

xorware/android_build,Hybrid-Power/startsync,xorware/android_build,knone1/platform_manifest,RR-msm7x30/platform_manifest,xorware/android_build,hagar006/platform_manifest,xorware/android_build,xorware/android_build,see4ri/lolili,fallouttester/platform_manifest,pranav01/platform_manifest,ND-3500/platform_manifest