First patch to compile for Android/x86