Merge "Remove gdbclient from envsetup."