am 92a35b93: am c0ba40b8: Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev

* commit '92a35b93cd6624906fc40ca559b653bdb6b2bd26':
  Remove libc++ from prepackaged shared libs in cts.