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

Change-Id: If827f77c9c8cb36ad3a8f2eaeb6157bc59258a7a