am 18cd8711: Merge "ART: Do not produce CFI when not asked for"

* commit '18cd8711d0059415dc8a99470fc105279a9ce0c6':
  ART: Do not produce CFI when not asked for