TEZ-1121. Clean up avro dependencies. (hitesh)
Merge remote branch 'origin/apache-ref/master' into champlain