Fix a typo, Smple -> Sample
Remove the unused define NOPREFIX

Nothing in the x86 assembly reacts to that define (nor anything
else within the code base).
Add defines of arg11 and arg12 in asm_inc.asm
Simplify code by using the arg11 and arg12 defines
Merge pull request #504 from mstorsjo/fix-function-name-typo

Fix a typo, Smple -> Sample
Merge pull request #507 from mstorsjo/more-x86-asm-args

Add defines for argument 11 and 12 in asm_inc
Merge pull request #506 from mstorsjo/remove-unused-define

Remove the unused define NOPREFIX
Merge remote-tracking branch 'upstream/master' into travis.android