C++ name lookup is hard, especially for clang tinderbox

Change-Id: I50a25e5cfa219bbdcf0a23c03b8e6a2cff72c3d6