am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
  sdk: provide ABI-dependent atree files