Reconcile with ics-mr1-release

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