Reconcile with jb-mr0-release - do not merge

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