Merge change 9523 into donut

* changes:
  Address intermittent CTS AutoCompleteTextViewTest failures.
tree: 095eade33c7cfe3c6fc262e52a08c7a5b019f59a
  1. tests/
  2. tools/
  3. Android.mk