[PATCH 0/6] VIM3: misc cleanups to prepare android support