Merge "Minor updates AHardware accessor in AImageReader" into oc-dev am: 1f31f24466
am: 62be7b944a

Change-Id: I45618caf8ef3659c05a42fa5f5bdd9f061dac8a5