Merge "Remove libstlport from PRODUCT_PACKAGES."