Merge "Disable tests requiring python3 for dist builds."