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

Change-Id: If51e5d1d8dcae8f17352b2e251e9c74e0e279d62