Roll back stlport change until it can be done across the whole codeba… …
…se and both android platforms