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

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