Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
tree: e63a74a3b1e56744ea8dccc8b5e384e646b3aacd
  1. res/
  2. src/