Merge "Remove the unused SMP instruction set feature option."