Merge "VPP: no verify on extras/emacs dir"