Merge remote-tracking branch 'remotes/gonglei/tags/cryptodev-next-20161224' into...