Reconcile with ics-factoryrom-2-release

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