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

Change-Id: Id6087f40bdfa561ea2798394f697d6b599322866