Merge "Use libstdc++ for ijar"