Merge "Use entrypoint switching on x86 & x86-64 for GC root read barriers." am: ffa5130425
am: 3038767f6f

Change-Id: Ie6077eccb331797a2f56243cd7364d8223328a29