Merge "Support rebuilding stlport/gabi++ libraries with clang."