Remove kws-rpc-builder loop dependency

Change-Id: I9581f3af0265eb03b295f1d04781e2e14c318594