Merge "Fix a few minor errors in host build scripts"
Andrew Hsieh authored
91530289