(cherry picked from commit a0c1d2ccdd62ef333e30f2fc9717fd0bf44ec4a3)

Conflicts:

	modules/video_output/Modules.am