am 6a4d88c2: am aebf3cda: Merge "Replace memory barriers to better reflect Java needs."

* commit '6a4d88c23bfbe3a6584476cd5a5111978c1dccca':
  Replace memory barriers to better reflect Java needs.