Revert "Fix to allow x86_64 to build."
Revert "Fix to allow x86_64 to build."

This reverts commit 2c13c4ba29a97c738062f177a39221100c6b7907.

Change-Id: I1b269a8fdc2d51ffa88a26adb1f5dbb2682b0342

YUPlayGodDev/platform_external_strace,Infinitive-OS/platform_external_strace,geekboxzone/mmallow_external_strace,kapdop/android_external_strace,kapdop/android_external_strace,CyanogenMod/android_external_strace,DirtyUnicorns/android_external_strace,bigzz/strace_android,geekboxzone/mmallow_external_strace,TeamExodus/external_strace,bigzz/strace_android,xin3liang/platform_external_strace,DirtyUnicorns/android_external_strace,AOSP-YU/platform_external_strace,android-ia/platform_external_strace,AOSP-YU/platform_external_strace,DirtyUnicorns/android_external_strace,xin3liang/platform_external_strace,CyanogenMod/android_external_strace,DirtyUnicorns/android_external_strace,YUPlayGodDev/platform_external_strace,xin3liang/platform_external_strace,Yu-AndroidM/android_external_strace,MonkeyZZZZ/platform_external_strace,android-ia/platform_external_strace,geekboxzone/lollipop_external_strace,YUPlayGodDev/platform_external_strace,CyanogenMod/android_external_strace,CyanogenMod/android_external_strace,MonkeyZZZZ/platform_external_strace,Infinitive-OS/platform_external_strace,DirtyUnicorns/android_external_strace,Yu-AndroidM/android_external_strace,bigzz/strace_android,android-ia/platform_external_strace,android-ia/platform_external_strace,TeamExodus/external_strace,Yu-AndroidM/android_external_strace,TeamExodus/external_strace,YUPlayGodDev/platform_external_strace,geekboxzone/lollipop_external_strace,geekboxzone/mmallow_external_strace,kapdop/android_external_strace,kapdop/android_external_strace,Infinitive-OS/platform_external_strace,AOSP-YU/platform_external_strace,MonkeyZZZZ/platform_external_strace,Infinitive-OS/platform_external_strace,kapdop/android_external_strace,AOSP-YU/platform_external_strace,geekboxzone/lollipop_external_strace,TeamExodus/external_strace,CyanogenMod/android_external_strace,AOSP-YU/platform_external_strace,geekboxzone/lollipop_external_strace,bigzz/strace_android,MonkeyZZZZ/platform_external_strace,android-ia/platform_external_strace,MonkeyZZZZ/platform_external_strace,TeamExodus/external_strace,bigzz/strace_android,geekboxzone/mmallow_external_strace,xin3liang/platform_external_strace,Yu-AndroidM/android_external_strace,YUPlayGodDev/platform_external_strace,geekboxzone/lollipop_external_strace,Yu-AndroidM/android_external_strace,geekboxzone/mmallow_external_strace,Infinitive-OS/platform_external_strace