am 2113fb14: Merge "Don\'t manually link stlport."
authorDan Albert <danalbert@google.com>
Fri, 26 Sep 2014 19:53:00 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 19:53:00 +0000 (19:53 +0000)
* commit '2113fb14d60becb6d419513f3752d4efa2f6a4cc':
  Don't manually link stlport.


Trivial merge