[chromium-libs-media-freeworld: 18/201] Backport more build fixes from upstream