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