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

Change-Id: Id51866d5e0e0615db96bbf25a8171e95f664faab