fix small issues, and big issues (submodule). and removed unneeded files from tools/Android-x86.