am 036bf65a: Merge "Removes bionic\'s dependence on stlport"

* commit '036bf65a9f295562a0e99a36683454323c4639b2':
  Removes bionic's dependence on stlport