Fix path to sysroots for git am: cdac36e2c8 am: 31dfb0bb7d am: cf6eca713f

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1996876

Change-Id: Id9218a9aade889c8dcfb864cf8cfa064f01db982