am 21ca146e: am 666170d1: am 029b00ef: am 75c7ca08: am c6f2450d: Merge "Add libstdc++ symbols for 64-bit archs"

* commit '21ca146ed2ab6d2fa15e758d35c111602fa6f1eb':