Fix gradle versions. am: d861c6d2a3 am: 26f16a4975 Change-Id: Ib8062900c58c14880c15068252749749152d856b