Merge "init: allow using the recovery image for 1st stage init"
am: 11b4cde8be

Change-Id: Idd58c44fab278d678d3550918c130b9b0192c75f