Merge changes I3556c3d8,Ife5f8dde

* changes:
  Make MediaSessionToken an inner class of MediaSession.
  Add media session wrappers to support library.