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

* commit '898f80538043ff6c296e13e6b86b1b8fcb87bddf':
  Revert "Removes bionic's dependence on stlport"