Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am: e93c655093  -s ours

Change-Id: Ieef907979d788ca3e9662e3f476698f6365f90ec