Merge "ABuffer: remove unused code"