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

Change-Id: I8bdcfaedd018be4f2773304f3e573cd05d182585