Merge "Don't adjust ABI if PackageSetting#pkg is null."