Merge "Enable fdtrack in system_server."