Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5
am: 97ba02c505

Change-Id: I3b377b6bd83cf6d7d293c89931ac13560e9db2c7