am 208b00c0: am 4b6d025b: Merge "Make it possible to change the read barrier type as build config."

* commit '208b00c05f030fe93dc7560d3c15ad4f0caa33e9':
  Make it possible to change the read barrier type as build config.