Merge change 9171 into donut

* changes:
  Integrate unsubmitted cupcake change 148896: 	CTS: add testcases for android.media.JetPlayer
tree: 6d3709ac6282f68c948993168ec6567e1a10d92f
  1. tests/
  2. tools/
  3. Android.mk