Merge "Merge "SDK: Also read sdk/build/tools.OS.atree""