am 0e007f9c: am ab7b1789: (-s ours) Merge "Upload 4.6 gnu-libstdc++"

* commit '0e007f9c6c3282598b0be56ab48237415321d4b6':
  Upload 4.6 gnu-libstdc++