Properly sets the build status for the non-exceptional code path when teardown is reached, and fixes the conditional for finding the teardown stage in the exceptional code path. Change-Id: I61e01b6920488a330af59ead141842430572876c