Merge "Removes bionic's dependence on stlport"