Update gradle version and GMS core used. am: 68c345bca1
am: c49028e2b8

Change-Id: If6adfb9478cbc4a6348ce4815d6fa873dc49b635