Merge "bionic libc tests: clean up the tests for setjmp"