Merge "Add CtsEdiHostTestCases to cts-instant build" into pie-cts-dev