am 3979b9bd: Merge "Remove libc++ from prepackaged shared libs in cts."

* commit '3979b9bdbc49db21d62b7d67a0b2c9b5007ee6b0':
  Remove libc++ from prepackaged shared libs in cts.