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

* commit 'a484e2d4fcaaaf03ce0c095d638755c7c737a1f0':
  Removes bionic's dependence on stlport