Compile issue fix for Android
submodule modification