Fix a regression caused by r102515 where explicit alignment on globals is

ignored. There was a test to catch this, but it was just blindly updated in
a large change. This fixes another part of <rdar://problem/9275290>.

llvm-svn: 129466