am b0f35657: am 1ab2edbc: Merge "Fix bug in parsing attributes for MediaRouteButton" into jb-dev

* commit 'b0f356579eb0348fac7157a6348f1e568556a4db':
  Fix bug in parsing attributes for MediaRouteButton