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

* commit '5dd0b93b9da0dc2f418f59f5865bf3fb1d13c406':