Merge change 6961 into donut

* changes:
  Integrate unsubmitted cupcake change 146708: 	CTS: add testcase for android.graphics.NinePatch
tree: ac138bc5d0d9a40f91525abb6a915bc33fad55a5
  1. tests/
  2. tools/
  3. Android.mk