Merge "Remove unnecessary ARRAY_SIZE macros."