am 93f22ee7: Merge "Disallow using stlport." into mnc-dev

* commit '93f22ee7e2987158dbfa2b30db38ae3f6b67128b':
  Disallow using stlport.