Add missing half of uksm/ksm auto-select

Change-Id: I28aa0c14de60e9422a6a922af62c82d73e445418