Update helm_tk script to be able to build unmerged code. Change-Id: I037fe74efd1fe03612f266b208ae5cf59faf9fdc