Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"