Revert "Fix aosp_x86_64 build."

Fix is not complete, arm64 was still failing.

This reverts commit 6666fe26242c1daed54c0e384bfcbb1e98ae2bfb.

Change-Id: Iad02965e730271f80aa59ca7d26b34a553bc0c70
1 file changed