gradle updates

Change-Id: I7f5ca6a5ecc315f8d4b7a6afd0cec4875364d8ee