DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method
am: 8211047138  -s ours

Change-Id: Ia562e06473ec26b173d36f91fa39a427fabdf9b7