Fix SDK build.

Revert "Fix build warnings"

This reverts commit 590e364868b6466e169f2647e95462ba2558dd00.
3 files changed