Reconcile with ics-mr1-release

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