Merge "Revert "Ensure that run-test preserves exit status""
am: e0d52dce6f

Change-Id: I2701036e3c7563daf2ef75aad96ce0b4d2a4e194