Merge "Remove FAKE_ARM64_BUILD now that we have 64 build working."