Merge "Move code around for deleting oat artifacts."