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

Change-Id: I49a846ff8853e6ee97679f959603e1ff9a2692b7