Updating for Google Play Services v6.5+ and targeting Lollipop SDK 21.

These updates also reintroduce activity segments when inserting a session.

Change-Id: I3dbeca537b12161e09faf7bc5e4abdb9153e259d
Updating sample config for compatibility with Android Studio 1.0

Change-Id: I197c2658a628b0a6ffcea1c198b0588bc1c49b05
Merge pull request #1 from googlesamples/master

update all commits