Merge "tools: Fix art script to delete OAT files before running dalvikvm"