Merge "Move code around for deleting oat artifacts." am: a7bf2a21d9 am: 69fbdcae71 am: 6518232039  -s ours
am: 4b8036f6ce

Change-Id: I3d47d3084b886cca0f0dbc6068b95f927c2fe2cc