Merge "AImageReader: Add support for private format" into oc-mr1-dev