Merge "Add a recovery ACPIO section to boot image"
am: 2c7c800122

Change-Id: I820687d31e1ed1cddf1534d1f22f9751230177f5