Merge "Rework y4mwrite test to pass google3 tests"