Merge "Add -ldl for new stlport"