Merge change 3119 into donut

* changes:
  Integrate unsubmitted cupcake change 117229: 	CTS: add test cases for ZoomButton
tree: 1459172e2cc96cdaf867c1edaa4aa1936fa6289b
  1. tests/
  2. tools/
  3. Android.mk