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

* commit '1f71e131b61721bfca7efe72e3b39f9a0dd4c41b':
  Removes bionic's dependence on stlport