Merge "Remove stlport modules."
am: 0fab56c64b

Change-Id: I734e5224be38d001ed834fd2baa9bf2525a75406