Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: I1bc3bdb524dffa351664c756742e1bbdc622a8b7
tree: 1563f0a1eecf534ca2370b8a8e46a713cc48370c
  1. renderscript/
  2. v13/
  3. v4/
  4. v7/