am b963c3ab: am e2efac06: (-s ours) am dfef0790: am f81c2302: Merge "Minify & jack flags in Gradle test project." into studio-1.4-dev automerge: 4bdb3b8 automerge: d324c81

* commit 'b963c3abc28e0b47dd75c4fd15257356ca192669':