Merge "Fix Soong x86 builds"