Merge "Clean up imagedecoder header file"