Bug 1291811 - Move GeckoView Java sources into mobile/android/geckoview. r=sebastian

This is the first step only.  It moves Experiments out of util (just
for convenience) -- I would have liked to have moved WhatsNewReceiver
out of notifications as well, but it's referenced in
AndroidManifest.xml.in and I don't want to break that.

The set of files in GeckoView is slightly larger than what we really
want, but it's close to correct.  Future tickets will get things
compiling and trim the set of files down to size.  Hopefully we can
move notifications/, permissions/, and restrictions/ back to Fennec.

This is not technically required, but it's best to bulk move the files
up front and patch later, rather than jump through hoops to
distinguish the set of files in Gradle (and moz.build).

MozReview-Commit-ID: EWaAeswFoeG

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/util/Experiments.java => mobile/android/base/java/org/mozilla/gecko/Experiments.java
rename : mobile/android/base/java/org/mozilla/gecko/ANRReporter.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/ANRReporter.java
rename : mobile/android/base/java/org/mozilla/gecko/AlarmReceiver.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/AlarmReceiver.java
rename : mobile/android/base/java/org/mozilla/gecko/AndroidGamepadManager.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/AndroidGamepadManager.java
rename : mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/BaseGeckoInterface.java
rename : mobile/android/base/java/org/mozilla/gecko/ContextGetter.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/ContextGetter.java
rename : mobile/android/base/java/org/mozilla/gecko/CrashHandler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashHandler.java
rename : mobile/android/base/java/org/mozilla/gecko/EventDispatcher.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/EventDispatcher.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoAccessibility.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAccessibility.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoBatteryManager.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoBatteryManager.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoEditable.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditable.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoEditableClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableClient.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoEditableListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableListener.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEvent.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoHalDefines.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoHalDefines.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoInputConnection.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoInputConnection.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoNetworkManager.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoNetworkManager.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoProfile.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoProfileDirectories.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoScreenOrientation.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoScreenOrientation.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoService.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoService.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoSharedPrefs.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSharedPrefs.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoSmsManager.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoSmsManager.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoThread.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoView.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoView.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoViewChrome.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoViewChrome.java
rename : mobile/android/base/java/org/mozilla/gecko/GeckoViewContent.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoViewContent.java
rename : mobile/android/base/java/org/mozilla/gecko/InputConnectionListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/InputConnectionListener.java
rename : mobile/android/base/java/org/mozilla/gecko/InputMethods.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/InputMethods.java
rename : mobile/android/base/java/org/mozilla/gecko/NSSBridge.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/NSSBridge.java
rename : mobile/android/base/java/org/mozilla/gecko/PrefsHelper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/PrefsHelper.java
rename : mobile/android/base/java/org/mozilla/gecko/SmsManager.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/SmsManager.java
rename : mobile/android/base/java/org/mozilla/gecko/TouchEventInterceptor.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/TouchEventInterceptor.java
rename : mobile/android/base/java/org/mozilla/gecko/ZoomConstraints.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/ZoomConstraints.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/Axis.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/Axis.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/BitmapUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/BitmapUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/BufferedImage.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/BufferedImage.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/BufferedImageGLInfo.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/BufferedImageGLInfo.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/DrawTimingQueue.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/DrawTimingQueue.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/DynamicToolbarAnimator.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/DynamicToolbarAnimator.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/FloatSize.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FloatSize.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/FullScreenState.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/FullScreenState.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/GeckoLayerClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/IntSize.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/IntSize.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/JavaPanZoomController.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/Layer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/Layer.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/LayerRenderer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerRenderer.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/LayerView.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerView.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/NativePanZoomController.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/NativePanZoomController.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/Overscroll.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/Overscroll.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/OverscrollEdgeEffect.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/OverscrollEdgeEffect.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PanZoomController.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanZoomController.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PanZoomTarget.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanZoomTarget.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PanningPerfAPI.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanningPerfAPI.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PluginLayer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PluginLayer.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PointUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PointUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/ProgressiveUpdateData.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/ProgressiveUpdateData.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/RectUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/RectUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/RenderTask.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/RenderTask.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/ScrollbarLayer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/ScrollbarLayer.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/StackScroller.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/StackScroller.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/TextureGenerator.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/TextureGenerator.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/TextureReaper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/TextureReaper.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/TouchEventHandler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/TouchEventHandler.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/ViewTransform.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/ViewTransform.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/VirtualLayer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/VirtualLayer.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/ByteBufferInputStream.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/ByteBufferInputStream.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/DirectBufferAllocator.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/DirectBufferAllocator.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/GeckoLoader.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/JNIObject.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/JNIObject.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/NativeReference.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeReference.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/NativeZip.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/SafeIntent.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/AppNotificationClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/AppNotificationClient.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/NotificationClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/NotificationClient.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHandler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/NotificationHandler.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/NotificationHelper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/NotificationHelper.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/NotificationReceiver.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/NotificationReceiver.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/NotificationService.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/NotificationService.java
rename : mobile/android/base/java/org/mozilla/gecko/notifications/ServiceNotificationClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/notifications/ServiceNotificationClient.java
rename : mobile/android/base/java/org/mozilla/gecko/permissions/PermissionBlock.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/permissions/PermissionBlock.java
rename : mobile/android/base/java/org/mozilla/gecko/permissions/Permissions.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/permissions/Permissions.java
rename : mobile/android/base/java/org/mozilla/gecko/permissions/PermissionsHelper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/permissions/PermissionsHelper.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictable.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictable.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionCache.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionCache.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionProvider.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
rename : mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictions.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/restrictions/Restrictions.java
rename : mobile/android/base/java/org/mozilla/gecko/sqlite/ByteBufferInputStream.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/sqlite/ByteBufferInputStream.java
rename : mobile/android/base/java/org/mozilla/gecko/sqlite/MatrixBlobCursor.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/sqlite/MatrixBlobCursor.java
rename : mobile/android/base/java/org/mozilla/gecko/sqlite/SQLiteBridge.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/sqlite/SQLiteBridge.java
rename : mobile/android/base/java/org/mozilla/gecko/sqlite/SQLiteBridgeException.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/sqlite/SQLiteBridgeException.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ActivityResultHandler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ActivityResultHandler.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ActivityResultHandlerMap.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ActivityResultHandlerMap.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ActivityUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ActivityUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/BundleEventListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BundleEventListener.java
rename : mobile/android/base/java/org/mozilla/gecko/util/Clipboard.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/Clipboard.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ContextUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ContextUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/DateUtil.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DateUtil.java
rename : mobile/android/base/java/org/mozilla/gecko/util/DrawableUtil.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/DrawableUtil.java
rename : mobile/android/base/java/org/mozilla/gecko/util/EventCallback.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/EventCallback.java
rename : mobile/android/base/java/org/mozilla/gecko/util/FileUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FileUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/FloatUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/FloatUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/GamepadUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GamepadUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/GeckoBackgroundThread.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBackgroundThread.java
rename : mobile/android/base/java/org/mozilla/gecko/util/GeckoEventListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoEventListener.java
rename : mobile/android/base/java/org/mozilla/gecko/util/GeckoJarReader.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoJarReader.java
rename : mobile/android/base/java/org/mozilla/gecko/util/GeckoRequest.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoRequest.java
rename : mobile/android/base/java/org/mozilla/gecko/util/HardwareCodecCapabilityUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/HardwareCodecCapabilityUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/HardwareUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/HardwareUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/INIParser.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/INIParser.java
rename : mobile/android/base/java/org/mozilla/gecko/util/INISection.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/INISection.java
rename : mobile/android/base/java/org/mozilla/gecko/util/IOUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IOUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/InputOptionsUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/InputOptionsUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/IntentUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/IntentUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/JSONUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/JSONUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/MenuUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/MenuUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/NativeEventListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NativeEventListener.java
rename : mobile/android/base/java/org/mozilla/gecko/util/NativeJSContainer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NativeJSContainer.java
rename : mobile/android/base/java/org/mozilla/gecko/util/NativeJSObject.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NativeJSObject.java
rename : mobile/android/base/java/org/mozilla/gecko/util/NetworkUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/NonEvictingLruCache.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NonEvictingLruCache.java
rename : mobile/android/base/java/org/mozilla/gecko/util/PrefUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/PrefUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ProxySelector.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
rename : mobile/android/base/java/org/mozilla/gecko/util/RawResource.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/RawResource.java
rename : mobile/android/base/java/org/mozilla/gecko/util/StringUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/StringUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/ThreadUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ThreadUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/util/UIAsyncTask.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/UIAsyncTask.java
rename : mobile/android/base/java/org/mozilla/gecko/util/UUIDUtil.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/UUIDUtil.java
rename : mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
rename : mobile/android/base/java/org/mozilla/gecko/util/WeakReferenceHandler.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WeakReferenceHandler.java
rename : mobile/android/base/java/org/mozilla/gecko/util/WebActivityMapper.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebActivityMapper.java
rename : mobile/android/base/java/org/mozilla/gecko/util/WindowUtils.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WindowUtils.java
rename : mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
extra : rebase_source : e41fd474a19e93cdee9328859ad3790b10daf7f7
extra : amend_source : 70bfd385f7210b98e09f64413655c668f658821c

mobile/android/app/build.gradle

@@ -85,6 +85,7 @@ android {
             manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
 
             java {
+                srcDir "${topsrcdir}/mobile/android/geckoview/src/main/java"
                 srcDir "${topsrcdir}/mobile/android/base/java"
                 srcDir "${topsrcdir}/mobile/android/search/java"
                 srcDir "${topsrcdir}/mobile/android/javaaddons/java"

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -11,9 +11,7 @@ import android.os.Environment;
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 
-import android.widget.AbsoluteLayout;
 import android.widget.VideoView;
-import android.graphics.RectF;
 import android.graphics.Rect;
 
 import org.json.JSONArray;
@@ -52,7 +50,6 @@ import org.mozilla.gecko.home.HomeConfig;
 import org.mozilla.gecko.home.HomeConfig.PanelType;
 import org.mozilla.gecko.home.HomeConfigPrefsBackend;
 import org.mozilla.gecko.home.HomeFragment;
-import org.mozilla.gecko.home.HomePager;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenInBackgroundListener;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.home.HomePanelsManager;
@@ -101,7 +98,6 @@ import org.mozilla.gecko.updater.UpdateServiceHelper;
 import org.mozilla.gecko.util.ActivityUtils;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.Experiments;
 import org.mozilla.gecko.util.FloatUtils;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.GeckoEventListener;
@@ -131,7 +127,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.nfc.NdefMessage;

mobile/android/base/java/org/mozilla/gecko/Experiments.java

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.gecko.util;
+package org.mozilla.gecko;
 
 import android.content.Context;
 
@@ -11,7 +11,6 @@ import android.text.TextUtils;
 
 import com.keepsafe.switchboard.Preferences;
 import com.keepsafe.switchboard.SwitchBoard;
-import org.mozilla.gecko.GeckoSharedPrefs;
 
 import java.util.LinkedList;
 import java.util.List;

mobile/android/base/java/org/mozilla/gecko/dlc/SyncAction.java

@@ -16,7 +16,7 @@ import org.json.JSONObject;
 import org.mozilla.gecko.dlc.catalog.DownloadContent;
 import org.mozilla.gecko.dlc.catalog.DownloadContentBuilder;
 import org.mozilla.gecko.dlc.catalog.DownloadContentCatalog;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.IOUtils;
 
 import java.io.BufferedInputStream;

mobile/android/base/java/org/mozilla/gecko/feeds/FeedService.java

@@ -27,7 +27,7 @@ import org.mozilla.gecko.feeds.action.SetupAlarmsAction;
 import org.mozilla.gecko.feeds.action.SubscribeToFeedAction;
 import org.mozilla.gecko.feeds.action.WithdrawSubscriptionsAction;
 import org.mozilla.gecko.preferences.GeckoPreferences;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 /**
  * Background service for subscribing to and checking website feeds to notify the user about updates.

mobile/android/base/java/org/mozilla/gecko/feeds/action/SetupAlarmsAction.java

@@ -16,10 +16,9 @@ import com.keepsafe.switchboard.SwitchBoard;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.feeds.FeedAlarmReceiver;
 import org.mozilla.gecko.feeds.FeedService;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 /**

mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunAnimationContainer.java

@@ -17,7 +17,7 @@ import android.animation.ObjectAnimator;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 /**
  * A container for the pager and the entire first run experience.

mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java

@@ -12,7 +12,7 @@ import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 import java.util.LinkedList;
 import java.util.List;

mobile/android/base/java/org/mozilla/gecko/home/HomePager.java

@@ -17,7 +17,6 @@ import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.home.HomeAdapter.OnAddPanelListener;
 import org.mozilla.gecko.home.HomeConfig.PanelConfig;
-import org.mozilla.gecko.util.Experiments;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;

mobile/android/base/java/org/mozilla/gecko/notifications/WhatsNewReceiver.java

@@ -14,7 +14,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
-import android.util.Log;
+
 import com.keepsafe.switchboard.SwitchBoard;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoSharedPrefs;
@@ -23,7 +23,7 @@ import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.preferences.GeckoPreferences;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 import java.util.Locale;
 

mobile/android/base/java/org/mozilla/gecko/promotion/AddToHomeScreenPromotion.java

@@ -25,7 +25,7 @@ import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.db.UrlAnnotations;
 import org.mozilla.gecko.delegates.TabsTrayVisibilityAwareDelegate;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import java.lang.ref.WeakReference;

mobile/android/base/java/org/mozilla/gecko/promotion/HomeScreenPrompt.java

@@ -28,7 +28,7 @@ import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.db.UrlAnnotations;
 import org.mozilla.gecko.favicons.Favicons;
 import org.mozilla.gecko.favicons.OnFaviconLoadedListener;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.ThreadUtils;
 
 /**

mobile/android/base/java/org/mozilla/gecko/promotion/ReaderViewBookmarkPromotion.java

@@ -17,7 +17,7 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.delegates.BrowserAppDelegateWithReference;
 import org.mozilla.gecko.reader.ReaderModeUtils;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 
 public class ReaderViewBookmarkPromotion extends BrowserAppDelegateWithReference implements Tabs.OnTabsChangedListener {
     private static final String PREF_FIRST_RV_HINT_SHOWN = "first_reader_view_hint_shown";

mobile/android/base/java/org/mozilla/gecko/telemetry/pingbuilders/TelemetryCorePingBuilder.java

@@ -22,7 +22,7 @@ import org.mozilla.gecko.search.SearchEngine;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.telemetry.TelemetryPing;
 import org.mozilla.gecko.util.DateUtil;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.StringUtils;
 
 import java.text.DateFormat;

mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java

@@ -22,7 +22,7 @@ import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.toolbar.BrowserToolbarTabletBase.ForwardButtonAnimation;
-import org.mozilla.gecko.util.Experiments;
+import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.widget.themed.ThemedLinearLayout;

mobile/android/base/moz.build

@@ -1,4 +1,4 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,6 +10,7 @@ CONFIGURE_SUBST_FILES += ['adjust_sdk_app_token']
 
 include('android-services.mozbuild')
 
+geckoview_source_dir = TOPSRCDIR + '/mobile/android/geckoview/src/main/'
 thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
 
 constants_jar = add_java_jar('constants')
@@ -82,7 +83,7 @@ if CONFIG['ANDROID_CUSTOMTABS_AAR']:
 resjar.javac_flags += ['-Xlint:all']
 
 mgjar = add_java_jar('gecko-mozglue')
-mgjar.sources += ['java/org/mozilla/gecko/' + x for x in [
+mgjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x for x in [
     'mozglue/ByteBufferInputStream.java',
     'mozglue/DirectBufferAllocator.java',
     'mozglue/GeckoLoader.java',
@@ -98,7 +99,7 @@ mgjar.extra_jars += [
 mgjar.javac_flags += ['-Xlint:all']
 
 gujar = add_java_jar('gecko-util')
-gujar.sources += ['java/org/mozilla/gecko/' + x for x in [
+gujar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x for x in [
     'util/ActivityResultHandler.java',
     'util/ActivityResultHandlerMap.java',
     'util/ActivityUtils.java',
@@ -197,7 +198,108 @@ if CONFIG['MOZ_WEBRTC']:
     ]
     wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast']
 
+geckoview_java_files = [
+    'AlarmReceiver.java',
+    'AndroidGamepadManager.java',
+    'ANRReporter.java',
+    'BaseGeckoInterface.java',
+    'ContextGetter.java',
+    'CrashHandler.java',
+    'EventDispatcher.java',
+    'GeckoAccessibility.java',
+    'GeckoAppShell.java',
+    'GeckoBatteryManager.java',
+    'GeckoEditable.java',
+    'GeckoEditableClient.java',
+    'GeckoEditableListener.java',
+    'GeckoEvent.java',
+    'GeckoHalDefines.java',
+    'GeckoInputConnection.java',
+    'GeckoJavaSampler.java',
+    'GeckoNetworkManager.java',
+    'GeckoProfile.java',
+    'GeckoProfileDirectories.java',
+    'GeckoScreenOrientation.java',
+    'GeckoService.java',
+    'GeckoSharedPrefs.java',
+    'GeckoSmsManager.java',
+    'GeckoThread.java',
+    'GeckoView.java',
+    'GeckoViewChrome.java',
+    'GeckoViewContent.java',
+    'gfx/Axis.java',
+    'gfx/BitmapUtils.java',
+    'gfx/BufferedImage.java',
+    'gfx/BufferedImageGLInfo.java',
+    'gfx/DisplayPortCalculator.java',
+    'gfx/DisplayPortMetrics.java',
+    'gfx/DrawTimingQueue.java',
+    'gfx/DynamicToolbarAnimator.java',
+    'gfx/FloatSize.java',
+    'gfx/FullScreenState.java',
+    'gfx/GeckoLayerClient.java',
+    'gfx/ImmutableViewportMetrics.java',
+    'gfx/IntSize.java',
+    'gfx/JavaPanZoomController.java',
+    'gfx/Layer.java',
+    'gfx/LayerRenderer.java',
+    'gfx/LayerView.java',
+    'gfx/NativePanZoomController.java',
+    'gfx/Overscroll.java',
+    'gfx/OverscrollEdgeEffect.java',
+    'gfx/PanningPerfAPI.java',
+    'gfx/PanZoomController.java',
+    'gfx/PanZoomTarget.java',
+    'gfx/PluginLayer.java',
+    'gfx/PointUtils.java',
+    'gfx/ProgressiveUpdateData.java',
+    'gfx/RectUtils.java',
+    'gfx/RenderTask.java',
+    'gfx/ScrollbarLayer.java',
+    'gfx/SimpleScaleGestureDetector.java',
+    'gfx/StackScroller.java',
+    'gfx/SubdocumentScrollHelper.java',
+    'gfx/TextureGenerator.java',
+    'gfx/TextureReaper.java',
+    'gfx/TouchEventHandler.java',
+    'gfx/ViewTransform.java',
+    'gfx/VirtualLayer.java',
+    'InputConnectionListener.java',
+    'InputMethods.java',
+    'notifications/AppNotificationClient.java',
+    'notifications/NotificationClient.java',
+    'notifications/NotificationHandler.java',
+    'notifications/NotificationHelper.java',
+    'notifications/NotificationReceiver.java',
+    'notifications/NotificationService.java',
+    'notifications/ServiceNotificationClient.java',
+    'NSSBridge.java',
+    'permissions/PermissionBlock.java',
+    'permissions/Permissions.java',
+    'permissions/PermissionsHelper.java',
+    'PrefsHelper.java',
+    'restrictions/DefaultConfiguration.java',
+    'restrictions/GuestProfileConfiguration.java',
+    'restrictions/Restrictable.java',
+    'restrictions/RestrictedProfileConfiguration.java',
+    'restrictions/RestrictionCache.java',
+    'restrictions/RestrictionConfiguration.java',
+    'restrictions/RestrictionProvider.java',
+    'restrictions/Restrictions.java',
+    'SmsManager.java',
+    'sqlite/ByteBufferInputStream.java',
+    'sqlite/MatrixBlobCursor.java',
+    'sqlite/SQLiteBridge.java',
+    'sqlite/SQLiteBridgeException.java',
+    'TouchEventInterceptor.java',
+    'widget/SwipeDismissListViewTouchListener.java',
+    'ZoomConstraints.java',
+]
+
 gbjar = add_java_jar('gecko-browser')
+gbjar.sources += [geckoview_source_dir + 'java/org/mozilla/gecko/' + x
+                  for x in geckoview_java_files]
+
 gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'AboutPages.java',
     'AccountsHelper.java',
@@ -206,23 +308,17 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'ActionModeCompatView.java',
     'ActivityHandlerHelper.java',
     'activitystream/ActivityStream.java',
-    'AlarmReceiver.java',
-    'AndroidGamepadManager.java',
     'animation/AnimationUtils.java',
     'animation/HeightChangeAnimation.java',
     'animation/PropertyAnimator.java',
     'animation/Rotate3DAnimation.java',
     'animation/ViewHelper.java',
-    'ANRReporter.java',
-    'BaseGeckoInterface.java',
     'BootReceiver.java',
     'BrowserApp.java',
     'BrowserLocaleManager.java',
     'cleanup/FileCleanupController.java',
     'cleanup/FileCleanupService.java',
     'ContactService.java',
-    'ContextGetter.java',
-    'CrashHandler.java',
     'CustomEditText.java',
     'customtabs/CustomTabsActivity.java',
     'customtabs/GeckoCustomTabsService.java',
@@ -286,7 +382,7 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'DownloadsIntegration.java',
     'DynamicToolbar.java',
     'EditBookmarkDialog.java',
-    'EventDispatcher.java',
+    'Experiments.java',
     'favicons/cache/FaviconCache.java',
     'favicons/cache/FaviconCacheElement.java',
     'favicons/cache/FaviconsForURL.java',
@@ -330,71 +426,13 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'firstrun/SyncPanel.java',
     'firstrun/TabQueuePanel.java',
     'FormAssistPopup.java',
-    'GeckoAccessibility.java',
     'GeckoActivity.java',
     'GeckoActivityStatus.java',
     'GeckoApp.java',
     'GeckoApplication.java',
-    'GeckoAppShell.java',
-    'GeckoBatteryManager.java',
-    'GeckoEditable.java',
-    'GeckoEditableClient.java',
-    'GeckoEditableListener.java',
-    'GeckoEvent.java',
-    'GeckoHalDefines.java',
-    'GeckoInputConnection.java',
-    'GeckoJavaSampler.java',
     'GeckoMessageReceiver.java',
-    'GeckoNetworkManager.java',
-    'GeckoProfile.java',
-    'GeckoProfileDirectories.java',
     'GeckoProfilesProvider.java',
-    'GeckoScreenOrientation.java',
-    'GeckoService.java',
-    'GeckoSharedPrefs.java',
-    'GeckoSmsManager.java',
-    'GeckoThread.java',
     'GeckoUpdateReceiver.java',
-    'GeckoView.java',
-    'GeckoViewChrome.java',
-    'GeckoViewContent.java',
-    'gfx/Axis.java',
-    'gfx/BitmapUtils.java',
-    'gfx/BufferedImage.java',
-    'gfx/BufferedImageGLInfo.java',
-    'gfx/DisplayPortCalculator.java',
-    'gfx/DisplayPortMetrics.java',
-    'gfx/DrawTimingQueue.java',
-    'gfx/DynamicToolbarAnimator.java',
-    'gfx/FloatSize.java',
-    'gfx/FullScreenState.java',
-    'gfx/GeckoLayerClient.java',
-    'gfx/ImmutableViewportMetrics.java',
-    'gfx/IntSize.java',
-    'gfx/JavaPanZoomController.java',
-    'gfx/Layer.java',
-    'gfx/LayerRenderer.java',
-    'gfx/LayerView.java',
-    'gfx/NativePanZoomController.java',
-    'gfx/Overscroll.java',
-    'gfx/OverscrollEdgeEffect.java',
-    'gfx/PanningPerfAPI.java',
-    'gfx/PanZoomController.java',
-    'gfx/PanZoomTarget.java',
-    'gfx/PluginLayer.java',
-    'gfx/PointUtils.java',
-    'gfx/ProgressiveUpdateData.java',
-    'gfx/RectUtils.java',
-    'gfx/RenderTask.java',
-    'gfx/ScrollbarLayer.java',
-    'gfx/SimpleScaleGestureDetector.java',
-    'gfx/StackScroller.java',
-    'gfx/SubdocumentScrollHelper.java',
-    'gfx/TextureGenerator.java',
-    'gfx/TextureReaper.java',
-    'gfx/TouchEventHandler.java',
-    'gfx/ViewTransform.java',
-    'gfx/VirtualLayer.java',
     'GlobalHistory.java',
     'GuestSession.java',
     'health/HealthRecorder.java',
@@ -459,8 +497,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'home/TopSitesPanel.java',
     'home/TopSitesThumbnailView.java',
     'home/TwoLinePageRow.java',
-    'InputConnectionListener.java',
-    'InputMethods.java',
     'IntentHelper.java',
     'javaaddons/JavaAddonManager.java',
     'javaaddons/JavaAddonManagerV1.java',
@@ -482,15 +518,7 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'menu/MenuPanel.java',
     'menu/MenuPopup.java',
     'MotionEventInterceptor.java',
-    'notifications/AppNotificationClient.java',
-    'notifications/NotificationClient.java',
-    'notifications/NotificationHandler.java',
-    'notifications/NotificationHelper.java',
-    'notifications/NotificationReceiver.java',
-    'notifications/NotificationService.java',
-    'notifications/ServiceNotificationClient.java',
     'notifications/WhatsNewReceiver.java',
-    'NSSBridge.java',
     'overlays/OverlayConstants.java',
     'overlays/service/OverlayActionService.java',
     'overlays/service/ShareData.java',
@@ -502,9 +530,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'overlays/ui/SendTabList.java',
     'overlays/ui/SendTabTargetSelectedListener.java',
     'overlays/ui/ShareDialog.java',
-    'permissions/PermissionBlock.java',
-    'permissions/Permissions.java',
-    'permissions/PermissionsHelper.java',
     'preferences/AlignRightLinkPreference.java',
     'preferences/AndroidImport.java',
     'preferences/AndroidImportPreference.java',
@@ -530,7 +555,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'preferences/SearchPreferenceCategory.java',
     'preferences/SetHomepagePreference.java',
     'preferences/SyncPreference.java',
-    'PrefsHelper.java',
     'PrintHelper.java',
     'PrivateTab.java',
     'promotion/AddToHomeScreenPromotion.java',
@@ -552,26 +576,13 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'reader/SavedReaderViewHelper.java',
     'RemoteClientsDialogFragment.java',
     'Restarter.java',
-    'restrictions/DefaultConfiguration.java',
-    'restrictions/GuestProfileConfiguration.java',
-    'restrictions/Restrictable.java',
-    'restrictions/RestrictedProfileConfiguration.java',
-    'restrictions/RestrictionCache.java',
-    'restrictions/RestrictionConfiguration.java',
-    'restrictions/RestrictionProvider.java',
-    'restrictions/Restrictions.java',
     'ScreenshotObserver.java',
     'search/SearchEngine.java',
     'search/SearchEngineManager.java',
     'SessionParser.java',
     'SharedPreferencesHelper.java',
     'SiteIdentity.java',
-    'SmsManager.java',
     'SnackbarBuilder.java',
-    'sqlite/ByteBufferInputStream.java',
-    'sqlite/MatrixBlobCursor.java',
-    'sqlite/SQLiteBridge.java',
-    'sqlite/SQLiteBridgeException.java',
     'SuggestClient.java',
     'Tab.java',
     'tabqueue/TabQueueHelper.java',
@@ -635,12 +646,10 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'toolbar/ToolbarEditText.java',
     'toolbar/ToolbarPrefs.java',
     'toolbar/ToolbarProgressView.java',
-    'TouchEventInterceptor.java',
     'trackingprotection/TrackingProtectionPrompt.java',
     'updater/PostUpdateHandler.java',
     'updater/UpdateService.java',
     'updater/UpdateServiceHelper.java',
-    'util/Experiments.java',
     'widget/ActivityChooserModel.java',
     'widget/AllCapsTextView.java',
     'widget/AnchoredPopup.java',
@@ -672,11 +681,9 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'widget/SiteLogins.java',
     'widget/SquaredImageView.java',
     'widget/SquaredRelativeLayout.java',
-    'widget/SwipeDismissListViewTouchListener.java',
     'widget/TabThumbnailWrapper.java',
     'widget/ThumbnailView.java',
     'widget/TwoWayView.java',
-    'ZoomConstraints.java',
     'ZoomedView.java',
 ]]
 # The following sources are checked in to version control but