Refine structure of iOS project to fix the issue.
Merge pull request #354 from zhilwang/arm-asm

Refine structure of iOS project to fix the issue.

I will merge this pull request for it is to fix broken the iOS build.   please raise fix patch If exist any issue on the iOS makefile
add a check to parseSliceHeaderSyntaxes
Merge pull request #355 from licaiguo/check-sliceheader

add a check to parseSliceHeaderSyntaxes
Merge remote-tracking branch 'upstream/master' into travis.android