am 818ce668: am b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""
am 818ce668: am b3ad3943: Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""

* commit '818ce6688d4b1b0fa50ebd7362371d624dd4c484':
  Revert "Remove libstlport from PRODUCT_PACKAGES."

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build