Merge "Remove gsi_util" am: fe9a8b11e7

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

Change-Id: Id85835640117626cac77b44951ede169b48d43a4