Combine poky and meta-phosphor as subtrees.
13 files changed