Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I17a677ffe0fc8690c059072478ca3ad7f0deec16
tree: 576306704c98943f605698ffee13947461cf0f24
  1. java/
  2. res/
  3. tests/
  4. Android.mk