Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

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