Merge "Update gradle version and GMS core used." into mnc-docs am: 276bfe8559
am: aa4c8c9480

Change-Id: I1fa23f0dee9d0fa6189fcf8318dd5921f845a0be