Merge change 3114 into donut

* changes:
  Integrate unsubmitted cupcake change 130903: 	CTS: add test cases for view.Surface
tree: 60517d77172699e9c713d588f2d53cd18df1f836
  1. tests/
  2. tools/
  3. Android.mk