Merge "better compatibility for unusual Qualcomm/Mediatek cellular ARPHRD_* values"