It breaks cross compilation with x86_64. This reverts commit 34e826cc. Change-Id: I34ba07821fc0a022fda33a7ae21850957bbec5e7