Reconcile with ics-factoryrom-2-release

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