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

Change-Id: I7b9a30d5729ae913be2149e46ae7eae6b2580ef9