Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61

Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I5941e78a43b785d2d77c3d140cfbd13aa4fcfd33