Merge "Filter JUnit and android.test classes from applications using proguard"