Merge "Make the ZygoteHooks API more consistent"