Merge "Add current/Android.jar as current_android_jar" am: a0e64bfbb8 am: cf7d3321a6

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

Change-Id: Ie98202e0930ce497c2c4b8ae59faf3b7f80b8552