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

* commit 'd555bcf7c1db7503edf046255b6fd4c94e4febec':