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

Change-Id: I555ef520067d4300450ef3b0e91f127d06e55b66