This reverts commit 8491e68a37.
Bug: 173677667
Reason for revert: Landed fix in https://android-review.googlesource.com/c/platform/art/+/1513256
Change-Id: Ibd0ec78c1f4aab6ce6c711c0a79650693fa94c08
This reverts commit 8491e68a37.
Bug: 173677667
Reason for revert: Landed fix in https://android-review.googlesource.com/c/platform/art/+/1513256
Change-Id: Ibd0ec78c1f4aab6ce6c711c0a79650693fa94c08