Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev am: e93c655093 -s ours
am: 885c6de358 -s ours
Change-Id: Iafeaa603502cb30d8a91db4e3c1d415b5bd163ea
This commit is contained in: