Merge commit '793ccedf5609c71f48abab5c3224238891711877'
Squashed 'CastCompanionLibrary/' changes from ca8c5dd..cc669ca

cc669ca Update README.md
88443c6 Version correctly updated in the resource
a16d2e6 Adding support for Lollipop notifications and some more. See the change list for version 1.11.
REVERT: ca8c5dd use a different notification icon, drop landscape cast activity layout

git-subtree-dir: CastCompanionLibrary
git-subtree-split: cc669ca447fbcf66ac9952a7ec665066dfb8aa89
Update to v21 support libraries, update themes, and update icons
Squashed 'CastCompanionLibrary/' changes from cc669ca..289951f

289951f new notification icon
3f78cef use a different notification icon, drop landscape cast activity layout

git-subtree-dir: CastCompanionLibrary
git-subtree-split: 289951f42e901041849f62a537ed34eaa4f8102c
Merge commit '0771cdff03924b4ab0b7118299634cb69b6abeab'