Renames s_isIOS7 to s_isIOS7OrHigher
remove unused local variable.
Merge pull request #6090 from dumganhar/iss4383-label-missing-letters

closed #4383: Fixed missing letters if using old LabelTTF and running on  iPhone 64bit simulator(device).
Merge pull request #6091 from Dhilan007/develop_label

Label:fixed possible appear OpenGL error 0x500.
Update CHANGELOG [ci skip]
fix autotest infinite loop
fixed cc.pGetAngle not using absolute value
Merge pull request #6092 from heliclei/fix-autotest

Fix autotest infinite loop
Updates templates for linux platform
Merge pull request #6094 from dumganhar/develop

Updates templates for linux platform
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6095 from samuele3hu/develop_socket

update android-build.py for copying files about lua
Android crash fix on new devices
[ci skip]
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Fixed copying resource fails in empty-lua-test.
Merge pull request #6099 from dumganhar/develop

Fixed copying resource fails in empty-lua-test.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py