Reconcile with ics-mr1-release

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