Merge "gsi_util: try to use executable in local bin/ folder"