Merge remote-tracking branch 'archiwebp/cm-11.0-gcc'