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

Change-Id: Ia24cebdbd7b04dd8ac7523cea53111e5228c9535