Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""