am 1c0f94c5: Reconcile with ics-factoryrom-2-release

* commit '1c0f94c5916921ee861933e080d7b0f711b019e1':
tree: cc47d6a96c8a28ad6f1175bd6de2a6be2f03d730
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk