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

Change-Id: I48491e36dcd95f83dfe4f93ccff5fb1581ac6202