Revert "[analyzer] Fix test/Analysis/padding_cpp.cpp after merge conflict."
Revert "[analyzer] Fix test/Analysis/padding_cpp.cpp after merge conflict."

This reverts commit 79074c703976a5e5b25b724837429f2049d85ccb.

rdar://problem/46721729

apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang,apple/swift-clang