Merge "Make it possible to enable read barriers at build time."