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

Change-Id: Id64abd84a6ab1af8ffc145a78d021a6e28095e90