HTCT3common: Fix killing everyone's builds

Change-Id: Ibc9cadf50e7935e5d650dd63b9c20487f5ce0853