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

* commit 'b3ad3943f363ab7c60d17125ac871e31c25b8a7a':
  Revert "Remove libstlport from PRODUCT_PACKAGES."

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