Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

shell/android/apk/src/org/chromium/mojo/shell/NativeHandlerThread.java

 // Copyright 2015 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.mojo.shell;
 
 import android.os.HandlerThread;
 
-import org.chromium.base.JNINamespace;
+import org.chromium.base.annotations.JNINamespace;
 
 /**
  * Handler thread associated with a native message loop.
  */
 @JNINamespace("shell")
 public class NativeHandlerThread extends HandlerThread {
     // The native message loop.
     private long mNativeMessageLoop = 0;
 
     /**
@@ skipping 25 matching lines @@
         if (mNativeMessageLoop == 0) {
             mNativeMessageLoop = nativeCreateMessageLoop();
         }
         super.onLooperPrepared();
     }
 
     native long nativeCreateMessageLoop();
 
     native void nativeDeleteMessageLoop(long messageLoop);
 }