Merge "BufferQueue consumers: Add discardFreeBuffer method" into nyc-mr1-dev