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