Merge "sdk.atree does not need DIST_DIR any longer."