Merge "ART: Make run-test 931 more defensive wrt/ shutdown"
am: e79bc4f2e6

Change-Id: Iee3283f81649c63e4f57a152797e1fe0b46caf19