Merge "Add JUnit4 library definition to IDEA" into studio-1.3-dev automerge: daafe33 * commit 'daafe332c09415ccf4864a990ff7e6aeb472defb': Add JUnit4 library definition to IDEA