Gradle

Change-Id: I44b8d73e19939c5ef4756b04cf2ef1c87a930cd2
Move as much as possible to external dependencies

Change-Id: I2cae49b469ba51e42c045b5e205071777eef2e6b