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

Change-Id: If5e92c3b0499f3d2f69975596678581dfc090733