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

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