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

Change-Id: I66eb282c44f03acf8abcb63f815acd4104160d0a