am aa64b110: Merge "String change for video routing via MediaRouter; "HDMI" not "HDMI audio."" into jb-mr1-dev

* commit 'aa64b11020c5283509c7ef37ecfe274a4f6b45f4':
  String change for video routing via MediaRouter; "HDMI" not "HDMI audio."