enable static/scroll Pskip functions
Get rid of uneven spacing after WELS_EXTERN
Remove mismatched chars at the end of a line marker

None of the other markers close by have similar chars.
Merge pull request #929 from lyao2/pskip_commit_

enable static/scroll Pskip functions
Merge pull request #930 from mstorsjo/cleanup-asm

Do some minor cleanups on the x86 assembly source
Merge remote-tracking branch 'upstream/master' into travis.android