Merge "Support custom sdk.atree files." into klp-modular-dev