Merge "Fix ART ARM64 CFI gtests with GCs other than CC with Baker read barriers."
am: ca67ae5b67

Change-Id: I778bbec9df486ba0a9d1be74fc5a99f9a9b0f1ea