am 41cfd244: am 743ef569: (-s ours) am 18e499f9: am 79352dd5: Merge "Add test for variant specific NDK config" into studio-1.4-dev automerge: 152f5dc automerge: d83cb6a

* commit '41cfd244943c31172155c850a1ab480c5645120c':