Merge changes from topic "presubmit-am-6505124ad4e8406084b930a1112eceb4"

* changes:
  [automerged blank] Only madvise primary oat/vdex artifacts 2p: 450bd87c07
  Only madvise primary oat/vdex artifacts