Merge "Build arm64 target valgrind with simplified bionic setjmp.S"