Fix some build issues#4382

Feiyang1 merged 2 commits intomasterfirebase/firebase-js-sdk:masterfrom

fei-buildsfirebase/firebase-js-sdk:fei-buildsCopy head branch name to clipboard