Finish converting to android gradle project