Merge "Use the aom_writer type rather than the tag in calling code." into nextgenv2