Merge "Revert "Revert "tools: Fix art script to delete OAT files before running dalvikvm""" am: c116154a4a
am: 4899b06303

Change-Id: I9cec5360abf8d61cee394ebdbe5fce834b93e5c0