Merge "ABuffer: remove unused code" am: d0f8fa383e
am: cb0f20a313

* commit 'cb0f20a3138d3e1d5586fd127c4f2f6c05e78a48':
  ABuffer: remove unused code