Merge "Merge "Updates gradle." into nyc-mr1-dev am: f4e89408 am: 6f1dc27e am: d0ed3852 am: 7d98f6fd" into oc-dev-plus-aosp