Reconcile with jb-release

Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
tree: d7443ce5cda3a7b0b8f77d1ee3e0b310ce33bc38
  1. res/
  2. src/