HighlyCompressedMapStatus's avgSize is incorrect

The calculation of HighlyCompressedMapStatus's avgSize is incorrect.
Currently, it looks like "sum of small blocks / count of all non empty blocks", the count of all non empty blocks not only contains small blocks, which contains huge blocks number also, but we need the count of small blocks only.