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

* commit '2db32730e79cafcf13e1f898a7bee7f82b0449d6':
  Merge "SDK: Also read sdk/build/tools.OS.atree"