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

Change-Id: I6612eb32f196b824bbf933f469a5c94d50faef2c