Merge "Fix build errors in test-resize."