Merge pull request #7244 from 2youyouo2/v3

update armature
[ci skip]
Fix Travis CI compilation issue
Merge pull request #7246 from pandamicro/origin_v3

Fix Travis CI compilation issue