Merge "Remove references to the pdk product variable" into main am: e6ca015645

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367

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