Merge "init: Support booting off GSIs installed to non-userdata block devices." am: 5aa37dc3dc
am: 34a9f9e204

Change-Id: I340913a23a717db7b2276fe319b01076a57bed79