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

Change-Id: I70bed63ae63a8b76ae73358773cbf615c838c2ae