am 6a876676: am 0e8413e4: Merge "Remove stlport from global package list."

* commit '6a876676f02d51c3fc346e5fc4d7a4b656f39340':
  Remove stlport from global package list.