Merge "Disallow using stlport." into mnc-dev