Merge change 7787 into donut

* changes:
  Integrate unsubmitted cupcake change 131603: 	CTS: add test cases for media.FaceDetector, MediaScannerConnection and SoundPool
tree: 6093dafc5f003465c925975b7e6d5d55a89482da
  1. tests/
  2. tools/
  3. Android.mk