Reconcile with ics-mr1-release

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