Cherry-pick to XFA: Fix a clang warning about a dangling else.