Merge changes from topic "am-ee6c719d7a974bd6848ce5df0bc066a9" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Copy implementation and header jars to make when possible am: fd53e210 am: dc6f5e87 -s ours
  [automerger skipped] Make apex variants of prebuilt apex exported modules available in make am: c30aea20 am: 665032bc -s ours