Merge "Catch SIGBUS in HeapWalker" am: b566e3cb2f am: 9926972bff
am: 549346f9ee

Change-Id: I77eecda271e3dffcd1dd902c75fff4d559a9c9cc