Merge "Avoid supported ABI list containing "unknown"."