Revert of Move from libstlport to libc++ for Android framework builds

platform_tools/android/bin/android_perf

 #!/bin/bash
 #
 # android_perf: utility for running perf on an android device
 #
 # The basic usage sequence is to run...
 #  1) perf record [gm/tests/bench] # runs profiler on specified app
 #  2) perf report # prints profiler results
 #  3) perf clean # cleans the temporary directory used to store results
 #
 
@@ skipping 23 matching lines @@
 TMP_APP_LOC=$PERF_TMP_DIR/data/local/tmp
 
 perf_setup() {
 
     mkdir -p $TMP_SYS_BIN
     mkdir -p $TMP_SYS_LIB
     mkdir -p $TMP_APP_LOC
 
     echo "Copying symbol files"
     adb_pull_if_needed /system/lib/libc.so $TMP_SYS_LIB
-    adb_pull_if_needed /system/lib/libc++.so $TMP_SYS_LIB
     adb_pull_if_needed /system/lib/libstlport.so $TMP_SYS_LIB
     adb_pull_if_needed /system/lib/libGLESv2.so $TMP_SYS_LIB
     adb_pull_if_needed /system/lib/libandroid.so $TMP_SYS_LIB
     adb_pull_if_needed /system/lib/libm.so $TMP_SYS_LIB
     adb_pull_if_needed /system/lib/libz.so $TMP_SYS_LIB
 
     # BUILDTYPE variable is set by android_setup.sh
     BUILDDIR="${SKIA_OUT}/${BUILDTYPE}"
     if [ ! -f "${BUILDDIR}/lib/lib${runVars[0]}.so" ];
     then
@@ skipping 57 matching lines @@
       perf_clean
       ;;
     *)
       echo -n "ERROR: unknown perf command ($PERF_CMD), valid values: "
       echo "setup, record, report, clean"
       exit 1;
       ;;
 esac
 
 exit 0;