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

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

Change-Id: Iba397cf81e3e40d09cc722811b01da639acb445c