Merge \"ART: Make run-test temp dir consistent\"
am: a8f4e9061a

Change-Id: I1d785103a7e4df2884384b0b482552a8e163e9f3