Merge pull request #1302 from hzhuang1/fix_build

Fix build with clang on hikey