Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"