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