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

Change-Id: Ib7350ee81474513996409c5a0bcc386e4618ff3d