Merge "media: Update ImageReader APIs" into klp-dev