Merge "Filter JUnit and android.test classes from applications using proguard" am: 38a231d6c3
am: 3e93d553ec

Change-Id: Iec55888705dedfc9b5aa7397057acd19a4627614