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

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