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

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