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

* commit 'fd841351efaeb241f0b499231671772caa21f19e':
  Support custom sdk.atree files.