Merge "Remove stlport modules." am: 0fab56c64b
am: d0acb7a43e

Change-Id: I598c3988802a68fc847941a8f7b8277876a21330