Merge "Clear odex/vdex/art file before running run-test"