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

Change-Id: I59cbef9799ac044d28755c61378cf1865b1398e1