[mpd/f30] Add upstream commit to fix gcc-9 build issue