Fix golem build. am: a974baaa56 am: 547e51c5b3 am: 28bfb9c14d

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

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