am 72c6dc31: am 45c4b171: Build static libstlport.

Merge commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52' into gingerbread-plus-aosp

* commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52':
  Build static libstlport.