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

Change-Id: I833cb09bab68e1d3df05add3e575cacd577e9d38