This reverts commit 68c6bd8b. Reason for revert: Broke ART test environments and emulator devices. Bug: 119293618 Change-Id: I1b0531d13c6565ce83801d93c78813af592eec1a