Use the old manifest merger, and upgrade to gradle plugin 0.12
Merge pull request #1563 from wordpress-mobile/issue/1562-upgrade-to-android-studio-beta

Upgrade to Android Studio beta (0.8.1)
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into issue/gradle-structure

Conflicts:
	build.gradle