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

Change-Id: I58716f750da5a2723a37ed2b7aca641fedc5c510