This reverts commit 0e904ffc. Reason for revert: Seems to break for 32-bit arm Bug: 66095511 Bug: 111199492 Bug: 116761923 Change-Id: I7d4bc78a1d5748a85ce63e2c57f32a8bdb768354