update gradle and cleanups

Change-Id: I310313b2244355667e6ee7b57908604b2593c479