Fix spurious #endif from previous cherry-pick
2 files changed