am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev

* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter