Merge "Make the ZygoteHooks API more consistent"
am: c205ef7d02

Change-Id: Ic8c710ae30a22bc838ec6728af72b6b41cc04a91