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

* commit '743ee8ec569719f994dc949527f354d58654681d':
tree: 3ef98e33bbb459b19e1c85fe5a6edb953c843a5f
  1. appcompat/
  2. renderscript/
  3. v13/
  4. v4/
  5. v7/