[automerger skipped] Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev am: 7983bfb3e6
am: 2997615e73 -s ours
am skip reason: change_id I570037866d1ae90794c711622e6045ebbffa5b9c with SHA1 bed1976f85 is in history

Change-Id: I9f5624711fc92453a3dcfa11bb2fa45dd5f3afc1