Merge commit '7c2be0426ef7f39266735389cd765e7aaaf997e8' into mm
Merge commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe' into mm
Merge commit 'b419c35c660d7421e18a9efef38eca11966b44c7' into mm
Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into mm
Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into mm
Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into mm
Moving junit out of core.jar and into core-junit.jar.

Patched from master.
https://android-git.corp.google.com/g/50609

Change-Id: Idbcebbd3ba3599234cf9615b4cf3d38e99d2983f
Merge (-sours) commit '98c9784d297b67beff5030cb9c1a13350c2ea711' into oxygen_4.3

* commit '98c9784d297b67beff5030cb9c1a13350c2ea711':
  Moving junit out of core.jar and into core-junit.jar.