Merge "gerrit-pgm: Align Buck rules with package boundaries"