Reconcile with ics-factoryrom-2-release

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