Merge "Fix path to JUnit jar for IDEA module in layoutlib"