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

Change-Id: I484d9b2ea63980d37368e364d1e2033bb4fe80ae