Merge "Renaming av_per_frame_bandwidth to avg_frame_bandwidth."