Merge "Add libstdc++ symbols for 64-bit archs"