Extend the multidex logic to only kick in for the main browser application.

content/public/android/java/src/org/chromium/content/common/SurfaceWrapper.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.common;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.view.Surface;
 
+import org.chromium.base.annotations.MainDex;
+
 /**
  * A wrapper for marshalling a Surface without self-destruction.
  */
+@MainDex
 public class SurfaceWrapper implements Parcelable {
     private final Surface mSurface;
 
     public SurfaceWrapper(Surface surface) {
         mSurface = surface;
     }
 
     public Surface getSurface() {
         return mSurface;
     }
@@ skipping 16 matching lines @@
                     Surface surface = Surface.CREATOR.createFromParcel(in);
                     return new SurfaceWrapper(surface);
                 }
 
                 @Override
                 public SurfaceWrapper[] newArray(int size) {
                     return new SurfaceWrapper[size];
                 }
             };
 }