am 497f8f18: Merge "Use libc++ for bionic tests."

* commit '497f8f1803815fec9828bf0a47659852f3ef4a0d':
  Use libc++ for bionic tests.