Merge "Remove old lint from PRODUCT_PACKAGES"