Revert submission

Reason for revert: breaks https://ci.chromium.org/p/art/builders/ci/angler-armv7-non-gen-cc/443

Bug: 140367850
Change-Id: I707dbb8a6f53d1c5e1d83596348d6eedc3186eb3
5 files changed