am 14fc930d: Merge "Clean up redundant links to stlport."

* commit '14fc930d5d2ef272b39342fa083f4097464fc9ea':
  Clean up redundant links to stlport.