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

Change-Id: Ib83e63c4e21071c020de29b38c7898ac1a0e5cb7