Merge "Remove gsi_util" am: fe9a8b11e7 am: 3680067a44 am: 447e37169f

Original change: https://android-review.googlesource.com/c/platform/development/+/1930482

Change-Id: I32442eff65bd3cadcde4713c1296d02a344075c3