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

* commit '8a47f6d3192140646d0d057c371b17e487fc2a77':
  Never use stlport on the host.