Merge "Add libstdc++ as a target for buildbot builds."