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

Change-Id: I6f1db057f3a65265635cd3883118f65832fc7b85