am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev

* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.