[SPARK-12604][CORE] Addendum - use casting vs mapValues for countBy{Key,Value}

Per rxin, let's use the casting for countByKey and countByValue as well. Let's see if this passes.

Author: Sean Owen <sowen@cloudera.com>

Closes #10641 from srowen/SPARK-12604.2.