Build changes for Gradle

Change-Id: Ib96a3cb6d32ec652b75ffae7fd16628484f7ed92