Merge remote-tracking branch 'upstream/master' into intel-extreme
media_reader/media_writer: Fix build