Merge "Fix dangling else in x86 build."