Reorder and label code sections in `tools/buildbot-sync.sh`. am: 5d24c3d431

Change-Id: Id5b949f6c15ca34dcbf4549ef11a88b65eb3434f