[cxx-mem-model] merge from trunk @ 178608

[Aldy Hernandez]

Nothing to report.  I fixed the minor hiccups in previous patches.

Bootstrapped and regtested.