am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread
am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread

Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp

* commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
  Support Additional CTS Host Jars

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