Merge "Fix PDK build."