Merge "Revert "Remove libstlport from PRODUCT_PACKAGES.""