This reverts commit 3b231900. Reason for revert: Broke ART test environments and emulator devices. Bug: 119293618 Change-Id: Ibad58feac6a919452d2da2437309e40d2480afcf