Merge back earlier 'acpica' material for v3.18.