[automerger skipped] Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5 am: 97ba02c505
am: 6bdf43af58 -s ours
am skip reason: change_id Ie65aac6539cffc90663807791511b95a6cd61ab4 with SHA1 555d8b7eca is in history

Change-Id: Ib4983fe157f2a7dc7dfd9c052e44262d34479ec8