Match draw triangles declaration to definition, fixes GCC link error.
Merge remote-tracking branch 'origin/dev' into android-dev

Conflicts:
	include/cinder/gl/gl.h