Merge "bufferqueue@1.0: remove comment in function def"