Merge cherrypicks of [12960543, 12960557] into studio-4.1-release Change-Id: Iaf64b58b444e6351a3aa639d138e2d4650ebb1d9
This is the source code of the Android plugin for IntelliJ platform, which is also the main part of Android Studio.
See the links below for implementation details and make sure to read IntelliJ Platform SDK docs first.