Fix golem build am: c607092fda am: 3eef07934b

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

Change-Id: If2aefed2e3890f0ead5e949ab37df6aa76e67f10