Merge "Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev am: 96995bb7a2 am: f86fdd6851"