A bunch of uncommitted changes from ~8 months ago!
Upgrade to recent Android Studio 0.8.9/Gradle 1.12/build tools 19.1.