am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb

* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
  Fix race in buffer ref counting.