Merge "Revert^2 "Ensure that run-test preserves exit status""
am: 18973583cd

Change-Id: I1ca4bebff50c2966cce5d1ebb8f2edde12696df3