Merge ACPI tables handling changes for v5.3.