Merge "Update imagedecoder.h to build as a C file"