am 61b8cd95: Merge "Remove direct dependence on stlport"

* commit '61b8cd95dcd8e4ebda7df65e9fb1d8512c7baa7a':
  Remove direct dependence on stlport