Convert to a gradle build system and the new android project structure.
Fix some missing closing tags in the layout.xml