Merge "Remove obsolete product_sdk.mk" am: ce1e3e3170 am: d1ecad2da3 am: 9c01d1a015

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

Change-Id: I2d62a3b330a0a77fc0125c6aed9fc1531ec28b3f