am a51bfa2a: (-s ours) am d9524387: am 270db726: Merge "Remove assemble task dependency on native binaries." into studio-1.4-dev automerge: 4ee253c automerge: de6140f

* commit 'a51bfa2a4b594843a7191abfb69f3f04585fbca0':