[automerger skipped] Merge "[DO NOT MERGE][Harness Separation] Update cts.mk...
[automerger skipped] Merge "[DO NOT MERGE][Harness Separation] Update cts.mk to point to the new harness repo" into pi-dev am: 7c2a9d25
am: 901f056e -s ours
Change-Id: I8745a682f1738f51b4c9e027655f846b888e3d19