Merge "Stop relying on /usr/bin/python for SDK builds"