sync the latest code of func_linux_a12_branch
resolve confict
Merge pull request #109 from chenjiexin/master

sync with func_linux_a12_branch r217435