Merge "Use new GsiInstallParams struct" am: 7898d33e3a am: 6b1e8cc0ab
am: 630b0caad1

Change-Id: I97e9c7767a5b3ff60e6533cb9a76ed128b6d606a