Merge "Updates gradle." into nyc-mr1-dev am: f4e89408 am: 6f1dc27e am: d0ed3852 am: fcbbec80 am: b9148c2c Change-Id: I3ac278329a7419bef7b58f59657ccfc5a1864b6a