DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method am: e175aa82b5  -s ours
am: 7d99482be5  -s ours

Change-Id: If6a0f0930f0012405186a8171af8c04f525adc52