Merge branch 'stable-2.16'

* stable-2.16:
  Fix test dependencies for in-tree build

Change-Id: Ic9aa28c070b50fe670029ab001f19fa974a52176