Merge "Now that Multidex is testonly, drop android-support-multidex"