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

Change-Id: I9a635c89e407129392ce122224be3e6d05400492