Merge "Update test harness to use matching build system" into devel/master