Merge "Move PDK selection into config.mk"