Merge "ImageReader/Writer: add usage flag support" into oc-dev
am: 96d4ac0cc6

Change-Id: Ia98cc7f1caf6d5628e2aae1d78d159dc3ac6d261