Fix art-interpreter-no-image am: b0c6bbf823 am: 29d144a37c am: c484f79107

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

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