Reconcile with ics-mr1-release

Change-Id: I0d6cb047da185ed18a4cb859a8c7c7585aa91930
tree: efa0d745a3a052566de006b5c9bc373e7fcf03e2
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk