MediaRouter2: Make TAGs have common prefix 'MR2'

Also does some minor fixes.

Test: Builds successfully
Change-Id: Ied4b1cc87241a7cb167959e8c452b0dcdea6b3b4
8 files changed