am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

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