Build fixes Androix x86 build and helpers