am 08ca8d5f: am 9ba48cef: Merge "Fix the read barrier builds."

* commit '08ca8d5fd3704854673cc4859a6ed58651b01eee':
  Fix the read barrier builds.