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

Change-Id: Ie3fe0e8e568b59bf880735b6aaae0909a2dc49a1