Merge "libcpustats: Turn on -Werror"