Merge "Handle segfaults while walking native heap am: ba5d9ff6d9 am: 5a964afd56" into nyc-mr1-dev-plus-aosp