Another fix at setting entrypoints in the runtime image. am: bfb2591159 am: 78c5aa44a3 am: deb66c5d8e

Original change: https://android-review.googlesource.com/c/platform/art/+/2422727

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