am 5fd0b6d4: resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp

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