Reconcile with jb-mr1.1-release - do not merge

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