Merge "Remove unnecessary lines in PRODUCT_PACKAGES"