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

Change-Id: I42f53657f38aaead6bfde4015992991dbb058575