Merge "Resync zygote64 and zygote64_32 rc files." am: 9f7a19d0f3 am: df1a5bf61f am: cf976b85b4 am: 5715c36cfa am: 8b3084ccd7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239035

Change-Id: I5b09341ffdae4a34cdeb73c65e4952137b71a759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>