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

Merge "Remove references to the pdk product variable" into main am: ca545707 am: 360703f4 am: 16bae38f am: 7f24dd19 am: 12ec2d94

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2693149



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