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

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

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