am da21ccf8: Grandfather the simulator-specific modules. do not merge.
am da21ccf8: Grandfather the simulator-specific modules. do not merge.

Merge commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp

* commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
  Grandfather the simulator-specific modules. do not merge.

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