Merge "Clear odex/vdex/art file before running run-test"
am: 0af0ec2b59

Change-Id: I0ea05a6d6d5146833604f44602224afcaef4a5c2