Merge "attempt to fix SDK build."