Merge "heif: omx image encoder changes"