Merge "Revert "Use libstdc++ for ijar""