Merge "Clean up ZygoteHooks stack walking slightly."
am: d5b260edbd

Change-Id: I58d6cfcdc50a3c12f3ea4a3bab2c026ac4be8f3a