am 201a8ba8: Reconcile with ics-mr1-release

* commit '201a8ba8531191b133ef4549b9cf0a61818a02d2':
tree: f6236e3c6040f91d381738db515d1a1bb0df422f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk