Merge "Fix some SVACE issues for yoga third-party code." into devel/master