svn merge -c 1230886 from trunk for MAPREDUCE-3545 to remove the empty avro directories.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230891 13f79535-47bb-0310-9956-ffa450edef68