Merge "Revise code of gsi_util help"
am: 65f8b7218a

Change-Id: I34bc69032d65e9e36600321a3c050b17c9d2245f