am bd7ba9ee: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'bd7ba9ee07d9a5cb573f272ba0cef2368a1a54c2':
tree: 1563f0a1eecf534ca2370b8a8e46a713cc48370c
  1. renderscript/
  2. v13/
  3. v4/
  4. v7/