Merge "SDK: update product sdk.mk"