Merge changes Id3c6cf5c,I7970575e,If3253a87

* changes:
  test.mk: simplify vp8/9 checks
  test.mk: regroup white box tests
  test.mk: enable test_intra_pred_speed unconditionally