Merge "MediaRouter bluetooth a2dp selection" into jb-dev