am 9a2a3d1e: am d664b16a: Merge "Make it possible to enable read barriers at build time."

* commit '9a2a3d1e9ea49cdf227638200d5698420529b3e4':
  Make it possible to enable read barriers at build time.