MediaRouter: Fix lint warnings
am: 04d0f0e928

Change-Id: I3a72ca9b0ed368a3226f2607c9d8308152371512