Merge "Switch android.test and junit classes to use UnsupportedAppUsage"