Merge "Add a recovery ACPIO section to boot image"