Reconcile with ics-mr1-release

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