DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method am: 8211047138  -s ours am: 7b265d8ab5  -s ours am: e373a97bd7  -s ours am: 3f3171788d  -s ours
am: 3c62c98e12  -s ours

Change-Id: I66d6f2c53ff3a454f15783199df413a9a285219c