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

Change-Id: Ia15f16850b100a32f7189ebef8819f09e465d90f