build with SDK 21

Conflicts:
	library/build.gradle
Merge branch 'hls' of https://github.com/martinbonnin/ExoPlayer into hls

# By Martin Bonnin
# Via Martin Bonnin
* 'hls' of https://github.com/martinbonnin/ExoPlayer:
  build with SDK 21