Gradle builder changes

Change-Id: Ieaa1c32678f92c757a7a8071984e7193e373f6b5