Fixes for x86 android build