am cc356db5: am 5ee74388: Merge "Disallow using stlport."

* commit 'cc356db5531d8c769e58bf1a98fda8f95fba7eed':
  Disallow using stlport.