Update to Android Gradle 0.8.x plugin
 - Refactor activity UI elements
 - Work around manifest merging bug