Merge "Update hardcoded references to android_*stubs_current" am: 0326e64c am: b9a6afe0

Original change: https://android-review.googlesource.com/c/platform/build/+/2498195



Change-Id: I7f050b963936c74b6a6a3469bad084b04de7479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>