Merge "Start using gradle 4.1 stable." am: 9baa713d52 am: f1fbd0da7e  -s ours am: 3e151a76e8 am: 0227b52552
am: 5bcddeb40f

Change-Id: If2c8881515b3ac2320e2ea723c82204543d732bc