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

Change-Id: Ifa75cfa2d2b0def72033d90765a57a5886254702