Merge "SDK: Use "strip -x" for atree."