Reconcile with jb-mr0-release

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