Merge change 3199 into donut

* changes:
  Integrate unsubmitted cupcake change 149109: 	CTS: add test case for android.widget.HorizontalScrollView
tree: 4616ea196878f662a818920c51e724ab9af02b20
  1. tests/
  2. tools/
  3. Android.mk