Merge "Put back gradle 2.2" am: 1ec64f4d17
am: 8539d6ae4c

Change-Id: If9f9adf9025d8be77cf09641acbf2d1ddc65518e