Merge "Remove compiler-rt load from zygote init" am: 6fa21baeec am: 0ad07eb0ed

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

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