Merge "init: Add support for GSI installations in first-stage mount." am: b43440ba79
am: ece1e52ae1

Change-Id: I33a278e8bcfd2cec1b494730d5e94f28ce06bdd4