Merge "libs.mk: simplify test_libvpx target"