Updates for android-gradle-plugin 0.9 and aside0.5