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

Change-Id: I841e8b1ae4329b3a45514f95fe02b55808446e2e