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

* commit '0e8413e45e59dd8598e6d63ebdad03469b3c01eb':
  Remove stlport from global package list.