Android 7.1.0 release 6
am 2d615e0e: am 6158b0c8: (-s ours) am d0aaeb05: am 42282d25: Merge ""Build Variants" view is only visible for Gradle-based Android projects." into studio-1.4-dev automerge: 6accd87 automerge: d339ffe

* commit '2d615e0e13e76a77a03ad29121f35af6ff36e3ef':