Merge "Add gradle plugin 2.2.0" am: 269e773f42  -s ours am: 7265f3a8f8
am: d6e84fc3a9

Change-Id: I5b4c8d472c28dcebcad7e7dada984ca56ca92e9e