am 4576d5ef: (-s ours) am 4faea310: Remove incomplete media router API. (DO NOT MERGE)

* commit '4576d5ef4427874bd98c0f0825841174b98b301e':
  Remove incomplete media router API. (DO NOT MERGE)