Merge "Disable read barrier thunks for heap poisoning"
am: 3ace1f0ce2

Change-Id: I5f0e3606cb05968ef517ebf5f99d1d87e84babef