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

Change-Id: Ifddf447f9597606bcc342778f20b92cb275def85