am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5

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