Merge "Revert "Use libstdc++ for ijar"" am: 41dca40376 am: 6cd88d7514
am: 06c44241da

* commit '06c44241da5ce7bb055a2ae7160daeb2bf66d85e':
  Revert "Use libstdc++ for ijar"