Android: More changes for x86 build