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

Change-Id: Ia84493f02d7db753af1222f9743b84f1be1d9f92