Merge "Disable read barrier thunks for heap poisoning" am: 3ace1f0ce2 am: 2c00094e63 am: 8c2a9f26fe
am: d060bb6ed0

Change-Id: Ic95c6dd8a62e522bb76375618ca9a2360bcddfdd