Move contrib directory to base test directory

This is needed to have post hook apply to both functional and api jobs.

This is aimed at fixing the output for the dsvm-api job in preparation
of the retargatable testing blueprint.

Change-Id: I39e2a7521a7b545a124b1cd42dc79da8986eff93
Merge "Move contrib directory to base test directory"