Merge change 7812 into donut

* changes:
  Integrate unsubmitted cupcake change 147095: 	CTS: cleanup code under package android.text
tree: 48019872178d50613c1e32913f5030e7022350c3
  1. tests/
  2. tools/
  3. Android.mk