Merge "Fix some SDK build breakage.  Not all."