Merge "Revert "Removes bionic's dependence on stlport""