Fix build report issue with FTL devices#1809

a-maurice merged 2 commits intomainfirebase/firebase-cpp-sdk:mainfrom

am-build_reportfirebase/firebase-cpp-sdk:am-build_reportCopy head branch name to clipboard