Reconcile with ics-mr1-release

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