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

Change-Id: I9245629f0a5ba6fed9695f591396747eb1ae911c