Reconcile with ics-mr1-release

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