Step 1: File standardization
Step 2:  Step 2: Full gradle, no more of this hybrid stuff

Includes Upload tasks, and all tasks from the build.xml, keeping the same property names and everything.
Also removed build.xml