Merge "Clean up use of deprecated JUnit apis." into studio-1.4-dev