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

* commit '8713fde1c3edf9dd6c5799cd3cc25b8f2ec2cb2d':
  Use libstdc++ for ijar