On extended testing, I'm seeing a CHECK failure at utility_arm.cc:1201. This reverts commit fcc36ba2. Change-Id: Icae3d49cd7c8fcab09f2f989cbcb1d7e5c6d137a