Merge "Move code around for deleting oat artifacts."
am: a7bf2a21d9

Change-Id: I63ef9f2a730dbe6ad37ce750be3a6a47636c14d6