Sneaky stlport

Change-Id: I40865af115251ac115e9efabb35c99c4178ef95d