[TIMOB-17988]: Update signature of addAnnotations method
Merge pull request #71 from hieupham007/timob-17988

[TIMOB-17988]: Update signature of addAnnotations method
Merge remote-tracking branch 'upstream/master' into drawing

Conflicts:
	android/manifest
	android/src/ti/map/ViewProxy.java