Reconcile with jb-release nakasi-factoryrom-release

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