Reconcile with jb-mr1-release - do not merge

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