Reconcile with ics-mr1-release

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