Merge change 3674 into donut

* changes:
  Integrate unsubmitted cupcake change 145678: 	CTS: fixed failed problem in ViewGroup_LayoutParamsTest
tree: 563959573d1f2cc160dafb10631b337b3f7607d9
  1. tests/
  2. tools/
  3. Android.mk