Ensure ./x.py dist adheres to build.tools
#87282
+154
−135
Merged