Reconcile with jb-mr2-release - do not merge

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