Fix gcc buildbot failures, re-enable tests disabled due to llvm.org/pr16575