Merge "Add more system_server benchmarks"