DO NOT MERGE: ConsumerBase: call freeBufferLocked when a slot is overwritten
am: 723c489872

Change-Id: I801da460d77c2d180bc92058db0c19b61171eb4a