Merge "Update Maven pom/jar prebuilts" am: 942e867545

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

Change-Id: Id7912cf88c4c81b5b63a45bda51524cc7bb3273c