Merge "Cleanup of Zygote files" am: 6fca4110dc am: c91fb923a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43db62c8e3a3f648f45cc985d132437af6759c3c