Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
tree: 192aff1d1b13f4bfe2c2acabc917b633ef402fd8
  1. res/
  2. src/