mods updating android cross compilation
Merge branch 'android-cross' into current