Merge "Deduplicate and rationalize system_server /proc/pid access."