Merge change 6483 into donut

* changes:
  Integrate unsubmitted cupcake change 149417: 	CTS: added missed test cases for package android.graphics.drawable
tree: 0ef60b67f1dd3571ce84a15c17a39fb8124d3cf9
  1. tests/
  2. tools/
  3. Android.mk