Continue to clean up prebuilt mapping am: 5057da215b

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/15854785

Change-Id: Iaaeb5f4e51c028ee2998e43ec5a08bff1b6acf6e