Reconcile with ics-mr1-release

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