Merge "Remove bug_map entry for system_server"