Merge "Build arm64 target valgrind with simplified bionic setjmp.S"
am: 3a6eb653ed

Change-Id: Ia8a16ff8bd9bc4fce631ea2a9ad9b26e10b9af6d