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

* commit '052b9c4d42c5bb69d889670a66ac4f2747d251dd':
  Remove stlport from global package list.