Port bug 902104 to fix build-sync-dirs bustage. rs=build system peer port,a=bustage fix for CLOSED TREE