Merge "Fix compiler warnings to enable -Werror."