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

Change-Id: Iab2a96adb127673a01e2cba872c34825c72e8a69