change: Update to Android Support Library r21.0.2
Merge branch 'master' into demo-build