Merge change 5599 into donut

* changes:
  Integrate unsubmitted cupcake change 131116: 	CTS: add test cases for graphics.drawable.BitmapDrawable, LayerDrawable, PaintDrawable, PictureDrawable, RotateDrawable and ScaleDrawable
tree: ec21865369bb33082a79bc1096bc061413fdae46
  1. tests/
  2. tools/
  3. Android.mk