Clean up PRODUCT_PACKAGES and remove unneeded packages