Merge "Check the ABI of libutils for vendor and product only" into main