My clang 3.7 built against libstdc++ 5.2.1 doesn't seem to have it. We
can get away with a non-regex replace all here, though.

Change-Id: Iea36311d89acb434c4e4f7c1f9ce876a6ee84f42