Merge "refactor(cpufeat): refactor arch feature build options" into integration