Fix linux building error
Merge remote-tracking branch 'origin/master'
Fix linux make error.