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

Change-Id: Ia2c2e6d8fc8a0fb5939d6db2d46b5cdeeae51f70