Commits in stlport/mainline:master