Build failures on arm/arm64. This reverts commit 6920703c. Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4