Merge "Remove unnecessary stlport dependency."