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

Change-Id: I58c10790307c1c43c17e052a10f7498905b16947