Broke arm64 build. This reverts commit c87d27b2. Change-Id: I4c2ade295d2b5aa77fc3ad810e0e859629a5bf09