Reset lengths to original APM tianocore values.

Signed-off-by: Al Stone <ahs3@redhat.com>
Redo the merge for loading ACPI tables properly this time.

Signed-off-by: Al Stone <ahs3@redhat.com>