Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I60b68feb036d2d484b705490d68113c856a611b9
tree: 0008c9cca43b40963cf5cad126a2b07c3a252e9a
  1. src/
  2. tests/
  3. Android.mk
  4. CleanSpec.mk