Merge "Bump avro to 1.8"