Merge "[RenderScript] Make support lib use c++_static instead of stlport_static." into nyc-dev