Merge "Remove obsolete product_sdk.mk references"