Merge "ANDROID: Fix x86 asm include guards"