Cleanup and fixup KConfig handling for componentchooser
Fixup for reviews 123288 and 123281.
REVIEW: 127918