Merge "Removes unused code from the SystemServer/Zygote classes."