Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
tree: 6dcde99235ea3a7f61c7869df68456058b6e6368
  1. res/
  2. src/