Merge back ACPICA changes for 4.19.