Merge "Set mcpu targets based on cpu variant."