am 82f3ae77: am 8a47f6d3: am f2bdac77: Merge "Never use stlport on the host."

* commit '82f3ae778e0eb6d5de134d19c0a23c7f04e5b540':
  Never use stlport on the host.