Reconcile with ics-mr1-release

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