Merge "Use longer test clips in y4m_test"