Merge "AImageDecoder: allow no color conversion"