Merge "Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev am: 7983bfb3 am: 63af175c" into qt-r1-dev-plus-aosp