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

Change-Id: I3ad0a6b82f500c244e9be9241fa10a16f6226b73