Revert "Temporary workaround for b/122369337"

This reverts commit 8ff6be03a3e0e691ed9cb461bbe297b1b63361f7.

Commit 07357a23336a895abef should have fixed the issue seen
on the ART build bots.

Bug: 122369337
Bug: 119293618
Test: Treehugger only
Change-Id: I06c1996e31e0f5fc1c80a9778b37ec6db40b487b
1 file changed