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

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