Merge "Move code around for deleting oat artifacts." am: a7bf2a21 am: 69fbdcae am: 65182320 -s ours am: 4b8036f6 Change-Id: I3d47d3084b886cca0f0dbc6068b95f927c2fe2cc