Merge "Fix typo in Clang CFlags" into release-4-5-patches