Revert "Fix entries in build.yaml being order dependent"
Revert "Fix entries in build.yaml being order dependent"

This reverts commit d7033ab40d3f0ef074c938466a6f0d42f8140bc5.

uber/zanzibar,uber/zanzibar,uber/zanzibar