Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev
am: 7983bfb3e6

Change-Id: If63d2cbe8b3ba2061276826f88496db8ea283510