Merge change 6527 into donut

* changes:
  Integrate unsubmitted cupcake change 124110: 	CTS: add test case for graphics.drawable.DrawableContainer and DrawableContainerState
tree: 3c4acb9db161801c4baf1dbacb25e55bfa0ba813
  1. tests/
  2. tools/
  3. Android.mk