Merge "Remove dead code from SystemServer"