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

Change-Id: I28ff7accce5cd643bcc76b59ac651e909ffa1d04