Merge "Stop using stlport."
authorDan Albert <danalbert@google.com>
Mon, 17 Nov 2014 22:27:44 +0000 (22:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 17 Nov 2014 22:27:44 +0000 (22:27 +0000)

Trivial merge