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

Change-Id: Icd72a60403a1cec0db1dc72251ab241c7aa60d41