Fix golem build am: c607092fda am: 3eef07934b am: 1c6d38bb86

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

Change-Id: I24e25c1312a22eec1951c233c9d6c523c2f6ef48