am 4de348d5: am 845a5129: am 747f43af: Merge "Revert "MediaRouter: fix the break on layout inflation when Theme.AppCompat is not used"" into mnc-dev

* commit '4de348d504c766b815f18580e472437d023b3419':
  Revert "MediaRouter: fix the break on layout inflation when Theme.AppCompat is not used"