Breaks checker tests on arm64/arm Bug: 65168732 This reverts commit 0ee89f41. Change-Id: I9fd14a8b01544481dadc485f51db4ff160c2733e