Merge "AImageDecoder: respond to API feedback" into sc-dev