Reconcile with jb-release

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