am 37ead709: am ffa91c3c: Reconcile with jb-mr1-release - do not merge

* commit '37ead709c672dec125158ecad1cd9b9322803996':
tree: fd346c3e469c3589b94e2830636ba39f2010f195
  1. renderscript/
  2. v13/
  3. v4/
  4. v7/