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

Change-Id: I0b3b2428a99524a61ddcbf2f97ffd7c44cbc56d4