Android playservices updated to 21
Merge remote-tracking branch 'origin/master'