am cf20b3ae: am 887a834c: Merge "Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit." into honeycomb

* commit 'cf20b3aec1a45e82a28ecd56f19c48c67fe431dd':
  Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit.