DC: clean up gradle building process a bit

Change-Id: Idbb5b5a05d4eaca60a15931060d7655c4fe8de8c