Merge "Using stlport_static or c++_static requires libdl."