am 3856df46: am b5aad4c5: Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"

* commit '3856df46f8ceb741b39dd40392b9485b47c35a54':
  ART: Add GENERATE_CFI to the ZygoteHooks debug flags