Merge "bufferqueue@1.0: remove comment in function def" am: 5418f17004
am: 1b7da8b6bb

Change-Id: I2569c0cc1b56cc92d1cfcded2672d22326a81284