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

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

Change-Id: I789c79b70f5455ece173b6e47d8ba76c1f91f504