Merge "SDK: fix sdk_repo build."