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

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