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

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

Change-Id: I73718092218938dbcd8fa2179563ff92f591965a