Merge "Get instruction-set/features from build/core/config.mk"