Reconcile with jb-release nakasi-factoryrom-release

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