Reconcile with jb-release

Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
tree: c0c8a1a01802e2c2590fb87b7168030d56f57e79
  1. res/
  2. src/