Revert "Better kt sync placement"

This reverts commit fc637b7cdc43e7aa75ee27d6fb7059f022e842d5.
update build scripts

Change-Id: I617b9c11a8b50985f363c9535662af52d7670fa4