Merge "Fix lint warnings of media router sample"