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

Change-Id: I92c53a8146484b2cc8a30863d0a4dfaf1954f069