am f2bdac77: Merge "Never use stlport on the host."

* commit 'f2bdac77b1d99abb190253f386cc6ffe4ffbeaca':
  Never use stlport on the host.