really fix the SDK build and fix THE build

Change-Id: I994cccf01bcafedc9ea11648eafc20300c58878b
1 file changed