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

Change-Id: I2c05a45f7c3595d21e11e3579a050a098e9e708d