Merge "Fix sdk build."