Merge "tools: Fix art script to delete OAT files before running dalvikvm" am: c7ba7f6aef
am: 8bdc540693

Change-Id: I0217afb9a862b90e63bd07211c905d7e82644151