Merge back 'acpi-video' material for v3.18.