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

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

Change-Id: Ieb642214f5cc2e1f465780d456905a8d555622a1