Merge "Use libstdc++ for ijar" am: c97b5272d7
am: 4c1944083f

* commit '4c1944083f03e1ddf55f16f815b89a337ffc60f6':
  Use libstdc++ for ijar