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

Change-Id: Idd3e9d324e2245883d2b095a1d930c223e031162