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

Change-Id: I006c0c5c96cc46e288ea2952329f1050f5417b97