Merge "Put back gradle 2.2"
am: 1ec64f4d17

Change-Id: Iced91ade7b94596914dbd53e12893b9990339ff1