[automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2...

[automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2 am: b4233d19 -s ours am: eb3e2fdf -s ours am: bd07bf3f -s ours

am skip reason: Change-Id Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4 with SHA-1 b00931e7 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1344822

Change-Id: I9384ce1b78c2b5eb7a08d1ab75d5027680785fd8