Reconcile with jb-mr1-release - do not merge

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