Revert submission

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

Change-Id: If849f0d15f121cfe44ba120c82a84c4bb8a5d324
4 files changed