Merge "Modified construction of built-in yang types."