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

Change-Id: Iaf1775a8470b6cf2f6c44b7f3ee105dda527730e