Update notes for submitted changes

* Merge vim and vimrc Android.mk in a single file