Merge "Revert "Revert "Revert "Revert "tools: Fix art script to delete OAT files before running dalvikvm""""" am: a52bcda623
am: b509269d58

Change-Id: Id8ce6df01eddbce3d4f42c66f632b9fae7afb23e