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