Merge "Fix failure with libvpx__unit_tests-multi-target"