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

Change-Id: I5f79ae01c1c8bfd9af70be41debeb407f804eef6