Merge \\"BufferQueue consumers: Add discardFreeBuffer method\\" into nyc-mr1-dev am: 52f82ade66
am: bc083616e7

Change-Id: Iff92c0e8f8358ff7c74700e664d0e75d8dda2ce7