am c898974b: Merge change 5553 into donut
am c898974b: Merge change 5553 into donut

Merge commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6'

* commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6':
  Change cts makefile to bundle junit.jar.

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