updating android generated h file and making sure we updateCallState before passing the TrackerId
Merge remote-tracking branch 'origin/master'