Merge change 2101 into donut

* changes:
  Integrate unsubmitted cupcake change 120332: 	CTS: add test cases for android.text.DynamicLayout
tree: ea5c164fe65603d903538d049b4e485820697b4f
  1. tests/
  2. tools/
  3. Android.mk