From-SVN: r210743
From-SVN: r205695
This may break gcc-asan on Mac, will follow up separately. From-SVN: r204368