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

Change-Id: Ife219bb456ce0bcd5729c4742c244d1272358074