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

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

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