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

Conflicts:
	v7/mediarouter/project.properties
change: Support ant to compile the samples