Merge "Simpleperf: remove dependency on global current_arch."