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

Change-Id: Ic9f9a6ea6e44dec0c7abe4d9ae19cb6ca67f8a0b