am 05b37cfc: Merge "Revert "Removes bionic\'s dependence on stlport""

* commit '05b37cfc182017876468445c589568ea0f27a3b7':
  Revert "Removes bionic's dependence on stlport"