Merge "Remove platform stlport from frameworks/rs."