Merge commit '84dafe6b5aee65c2f9546abfd7b817df23e074bf' into dev_branch
Merge branch 'dev_branch'
fix camera fps bug, delede neon obj
Merge branch 'dev_branch'