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

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

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