Merge pull request #6619 from myourys/v3

update cpp-default-template for android *Eclipse*
[ci skip]
[ci skip]
[ci skip] The tool of making package supports to insert the content of
another zip file
Merge pull request #6702 from dumganhar/make-package-support-insert-extra-zip

[ci skip] The tool of making package supports to insert the content of another zip file
Adds a comment before making archive file
Merge pull request #6704 from dumganhar/make-package-support-insert-extra-zip

Adds a comment before making archive file