Merge "Revert "tools: Fix art script to delete OAT files before running dalvikvm"" am: 4a9ab7d61f
am: 61db7d8dc4

Change-Id: Ifd523786fdb30a209c07d9365b846d69d594f2dc