Add x86 32/64bit asm code for SumOfBlocks.
Merge pull request #1267 from zhilwang/sumofblocks_scc

Add x86 32/64bit asm code for SumOfBlocks.
Fix build error ARM
Merge pull request #1271 from dongzha/fixBuildError

Fix build error ARM
Merge remote-tracking branch 'upstream/master' into travis.android