The distinction between CONFIG_KVM_CLOCK and CONFIG_KVM_GUEST is
not so clear anymore, as demonstrated by recent bugs caused by poor
handling of on/off combinations of these options.

Merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST.
Reported-By: NOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: NMarcelo Tosatti <mtosatti@redhat.com>