Update preloaded-classes for Honeycomb.

We preload classes for two reasons. Classes that are popular can be
shared and can increase the number of apps that can be run concurrently.
Classes that initialize slowly can be initialized at system boot time
by the zygote, decreasing the time to launch a specific app.

To select which classes to preload, I exercised Android's built-in apps
as well as these apps from Market: ESPN score center, Amazon, Flixster,
Twitter, Adobe Reader, Ebay Mobile, Facebook, Solitare (Ken Magic),
Barcode Reader, Google Earth and Square.

A cycle of launching ~460 (non unique) activities in sequence took 9m35s
with the previous preloaded-classes list. The update improves the launch
time of the same sequence to 9m27s: the marginal improvement over the
previous set of preloaded classes is negligible.

http://b/3004763

Change-Id: Ida511ae31eeff6d95d9cb6aacae68b9bb9dd2ebe
diff --git a/preloaded-classes b/preloaded-classes
index 6d5144f..ca2e6ed 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -7,11 +7,33 @@
 android.accounts.Account$1
 android.accounts.AccountManager
 android.accounts.AccountManager$12
+android.accounts.AccountManagerFuture
 android.accounts.IAccountManager
 android.accounts.IAccountManager$Stub
 android.accounts.IAccountManager$Stub$Proxy
+android.accounts.IAccountManagerResponse
+android.accounts.IAccountManagerResponse$Stub
+android.animation.Animator
+android.animation.Animator$AnimatorListener
+android.animation.FloatEvaluator
+android.animation.IntEvaluator
+android.animation.LayoutTransition$TransitionListener
+android.animation.PropertyValuesHolder
+android.animation.TimeInterpolator
+android.animation.TypeEvaluator
+android.animation.ValueAnimator
+android.animation.ValueAnimator$1
+android.animation.ValueAnimator$2
+android.animation.ValueAnimator$3
+android.animation.ValueAnimator$4
+android.animation.ValueAnimator$5
+android.app.ActionBar
+android.app.ActionBar$LayoutParams
 android.app.Activity
+android.app.Activity$NonConfigurationInstances
+android.app.ActivityManager
 android.app.ActivityManagerNative
+android.app.ActivityManagerNative$1
 android.app.ActivityManagerProxy
 android.app.ActivityThread
 android.app.ActivityThread$1
@@ -19,6 +41,7 @@
 android.app.ActivityThread$ActivityClientRecord
 android.app.ActivityThread$AppBindData
 android.app.ActivityThread$ApplicationThread
+android.app.ActivityThread$BindServiceData
 android.app.ActivityThread$ContextCleanupInfo
 android.app.ActivityThread$CreateServiceData
 android.app.ActivityThread$GcIdler
@@ -31,35 +54,66 @@
 android.app.ActivityThread$ServiceArgsData
 android.app.ActivityThread$StopInfo
 android.app.AlertDialog
+android.app.AlertDialog$Builder
 android.app.AppGlobals
 android.app.Application
 android.app.ApplicationErrorReport$CrashInfo
 android.app.ApplicationLoaders
+android.app.ApplicationPackageManager
+android.app.ApplicationPackageManager$ResourceName
 android.app.ApplicationThreadNative
+android.app.BackStackRecord
 android.app.ContextImpl
+android.app.ContextImpl$1
+android.app.ContextImpl$10
+android.app.ContextImpl$11
+android.app.ContextImpl$12
+android.app.ContextImpl$13
+android.app.ContextImpl$14
+android.app.ContextImpl$15
+android.app.ContextImpl$16
+android.app.ContextImpl$17
+android.app.ContextImpl$18
+android.app.ContextImpl$19
+android.app.ContextImpl$2
+android.app.ContextImpl$20
+android.app.ContextImpl$21
+android.app.ContextImpl$22
+android.app.ContextImpl$23
+android.app.ContextImpl$24
+android.app.ContextImpl$25
+android.app.ContextImpl$26
+android.app.ContextImpl$27
+android.app.ContextImpl$28
+android.app.ContextImpl$29
+android.app.ContextImpl$3
+android.app.ContextImpl$4
+android.app.ContextImpl$5
+android.app.ContextImpl$6
+android.app.ContextImpl$7
+android.app.ContextImpl$8
+android.app.ContextImpl$9
 android.app.ContextImpl$ApplicationContentResolver
-android.app.ContextImpl$ApplicationPackageManager
-android.app.ContextImpl$ApplicationPackageManager$ResourceName
-android.app.ContextImpl$SharedPreferencesImpl
-android.app.ContextImpl$SharedPreferencesImpl$1
-android.app.ContextImpl$SharedPreferencesImpl$EditorImpl
-android.app.ContextImpl$SharedPreferencesImpl$EditorImpl$1
-android.app.ContextImpl$SharedPreferencesImpl$EditorImpl$2
-android.app.ContextImpl$SharedPreferencesImpl$MemoryCommitResult
+android.app.ContextImpl$ServiceFetcher
+android.app.ContextImpl$StaticServiceFetcher
 android.app.Dialog
 android.app.Dialog$1
 android.app.Dialog$ListenersHandler
+android.app.Fragment
+android.app.FragmentManager
+android.app.FragmentManager$BackStackEntry
+android.app.FragmentManagerImpl
+android.app.FragmentManagerImpl$1
+android.app.FragmentTransaction
 android.app.IActivityManager
 android.app.IActivityManager$ContentProviderHolder
 android.app.IActivityManager$ContentProviderHolder$1
+android.app.IAlarmManager
+android.app.IAlarmManager$Stub
+android.app.IAlarmManager$Stub$Proxy
 android.app.IApplicationThread
 android.app.IInstrumentationWatcher
 android.app.IInstrumentationWatcher$Stub
-android.app.INotificationManager
-android.app.INotificationManager$Stub
-android.app.INotificationManager$Stub$Proxy
-android.app.ITransientNotification
-android.app.ITransientNotification$Stub
 android.app.Instrumentation
 android.app.IntentReceiverLeaked
 android.app.ListActivity
@@ -67,20 +121,22 @@
 android.app.LoadedApk$ReceiverDispatcher
 android.app.LoadedApk$ReceiverDispatcher$Args
 android.app.LoadedApk$ReceiverDispatcher$InnerReceiver
-android.app.LoadedApk$ServiceDispatcher$ConnectionInfo
-android.app.LoadedApk$ServiceDispatcher$DeathMonitor
-android.app.LoadedApk$ServiceDispatcher$RunConnection
 android.app.LoadedApk$WarningContextClassLoader
 android.app.NativeActivity
-android.app.NotificationManager
 android.app.PendingIntent
 android.app.PendingIntent$1
 android.app.QueuedWork
 android.app.ReceiverRestrictedContext
 android.app.ResultInfo
 android.app.ResultInfo$1
-android.app.SearchDialog
 android.app.Service
+android.app.SharedPreferencesImpl
+android.app.SharedPreferencesImpl$1
+android.app.SharedPreferencesImpl$2
+android.app.SharedPreferencesImpl$EditorImpl
+android.app.SharedPreferencesImpl$EditorImpl$1
+android.app.SharedPreferencesImpl$EditorImpl$2
+android.app.SharedPreferencesImpl$MemoryCommitResult
 android.app.backup.BackupDataInput
 android.app.backup.BackupDataInput$EntityHeader
 android.app.backup.BackupDataOutput
@@ -94,8 +150,8 @@
 android.bluetooth.IBluetooth$Stub
 android.bluetooth.IBluetoothA2dp
 android.bluetooth.IBluetoothA2dp$Stub
-android.bluetooth.ScoSocket
 android.content.BroadcastReceiver
+android.content.BroadcastReceiver$PendingResult
 android.content.ComponentCallbacks
 android.content.ComponentName
 android.content.ComponentName$1
@@ -179,7 +235,6 @@
 android.content.res.Resources$1
 android.content.res.Resources$Theme
 android.content.res.StringBlock
-android.content.res.StringBlock$StyleIDs
 android.content.res.TypedArray
 android.content.res.XmlBlock
 android.content.res.XmlBlock$Parser
@@ -202,8 +257,9 @@
 android.database.CursorWrapper
 android.database.DataSetObservable
 android.database.DataSetObserver
+android.database.DatabaseErrorHandler
 android.database.DatabaseUtils
-android.database.DatabaseUtils$InsertHelper
+android.database.DefaultDatabaseErrorHandler
 android.database.IBulkCursor
 android.database.IContentObserver
 android.database.IContentObserver$Stub
@@ -214,7 +270,8 @@
 android.database.sqlite.SQLiteCursor
 android.database.sqlite.SQLiteCursorDriver
 android.database.sqlite.SQLiteDatabase
-android.database.sqlite.SQLiteDatabase$ActiveDatabases
+android.database.sqlite.SQLiteDatabase$1
+android.database.sqlite.SQLiteDatabase$CustomFunction
 android.database.sqlite.SQLiteDebug
 android.database.sqlite.SQLiteDebug$DbStats
 android.database.sqlite.SQLiteDebug$PagerStats
@@ -237,13 +294,16 @@
 android.graphics.AvoidXfermode
 android.graphics.Bitmap
 android.graphics.Bitmap$1
+android.graphics.Bitmap$BitmapFinalizer
 android.graphics.Bitmap$Config
 android.graphics.BitmapFactory
 android.graphics.BitmapFactory$Options
+android.graphics.BitmapRegionDecoder
 android.graphics.BitmapShader
 android.graphics.BlurMaskFilter
 android.graphics.Camera
 android.graphics.Canvas
+android.graphics.Canvas$CanvasFinalizer
 android.graphics.Canvas$EdgeType
 android.graphics.Color
 android.graphics.ColorFilter
@@ -294,13 +354,14 @@
 android.graphics.RectF$1
 android.graphics.Region
 android.graphics.Region$1
+android.graphics.Region$Op
 android.graphics.RegionIterator
 android.graphics.Shader
 android.graphics.Shader$TileMode
 android.graphics.SumPathEffect
+android.graphics.SurfaceTexture
 android.graphics.SweepGradient
 android.graphics.TableMaskFilter
-android.graphics.TemporaryBuffer
 android.graphics.Typeface
 android.graphics.Xfermode
 android.graphics.YuvImage
@@ -319,6 +380,7 @@
 android.graphics.drawable.Drawable$Callback
 android.graphics.drawable.Drawable$ConstantState
 android.graphics.drawable.DrawableContainer
+android.graphics.drawable.DrawableContainer$1
 android.graphics.drawable.DrawableContainer$DrawableContainerState
 android.graphics.drawable.GradientDrawable
 android.graphics.drawable.GradientDrawable$GradientState
@@ -328,29 +390,24 @@
 android.graphics.drawable.LayerDrawable$LayerState
 android.graphics.drawable.NinePatchDrawable
 android.graphics.drawable.NinePatchDrawable$NinePatchState
-android.graphics.drawable.ShapeDrawable
-android.graphics.drawable.ShapeDrawable$ShapeState
+android.graphics.drawable.RotateDrawable
+android.graphics.drawable.RotateDrawable$RotateState
 android.graphics.drawable.StateListDrawable
 android.graphics.drawable.StateListDrawable$StateListState
 android.graphics.drawable.TransitionDrawable
 android.graphics.drawable.TransitionDrawable$TransitionState
-android.graphics.drawable.shapes.RectShape
-android.graphics.drawable.shapes.RoundRectShape
-android.graphics.drawable.shapes.Shape
-android.graphics.utils.BoundaryPatch
 android.hardware.Camera
 android.hardware.Camera$CameraInfo
 android.hardware.SensorManager
 android.inputmethodservice.ExtractEditText
-android.inputmethodservice.InputMethodService
 android.location.GpsSatellite
 android.location.GpsStatus
 android.location.GpsStatus$1
 android.location.ILocationManager
 android.location.ILocationManager$Stub
 android.location.ILocationManager$Stub$Proxy
+android.location.Location
 android.location.LocationManager
-android.media.AmrInputStream
 android.media.AudioFormat
 android.media.AudioManager
 android.media.AudioManager$1
@@ -361,19 +418,10 @@
 android.media.AudioTrack
 android.media.CamcorderProfile
 android.media.DecoderCapabilities
-android.media.ExifInterface
 android.media.IAudioFocusDispatcher
 android.media.IAudioFocusDispatcher$Stub
-android.media.IAudioService
-android.media.IAudioService$Stub
-android.media.IAudioService$Stub$Proxy
 android.media.JetPlayer
 android.media.MediaPlayer
-android.media.MediaPlayer$OnCompletionListener
-android.media.MediaPlayer$OnErrorListener
-android.media.MediaPlayer$OnPreparedListener
-android.media.MediaScanner
-android.media.SoundPool
 android.media.ToneGenerator
 android.net.ConnectivityManager
 android.net.Credentials
@@ -392,6 +440,9 @@
 android.net.NetworkInfo$DetailedState
 android.net.NetworkInfo$State
 android.net.NetworkUtils
+android.net.Proxy
+android.net.ProxyProperties
+android.net.ProxyProperties$1
 android.net.TrafficStats
 android.net.Uri
 android.net.Uri$1
@@ -399,19 +450,15 @@
 android.net.Uri$AbstractPart
 android.net.Uri$Builder
 android.net.Uri$HierarchicalUri
-android.net.Uri$OpaqueUri
 android.net.Uri$Part
 android.net.Uri$Part$EmptyPart
 android.net.Uri$PathPart
 android.net.Uri$PathSegments
 android.net.Uri$PathSegmentsBuilder
 android.net.Uri$StringUri
-android.net.WebAddress
-android.net.http.AndroidHttpClient
-android.net.http.AndroidHttpClient$1
-android.net.http.EventHandler
-android.net.http.HttpsConnection
 android.net.wifi.WifiNative
+android.nfc.NdefMessage
+android.nfc.NdefRecord
 android.opengl.ETC1
 android.opengl.GLES10
 android.opengl.GLES10Ext
@@ -422,7 +469,14 @@
 android.opengl.Matrix
 android.opengl.Visibility
 android.os.AsyncTask$1
+android.os.AsyncTask$2
+android.os.AsyncTask$3
 android.os.AsyncTask$AsyncTaskResult
+android.os.AsyncTask$InternalHandler
+android.os.AsyncTask$SerialExecutor
+android.os.AsyncTask$SerialExecutor$1
+android.os.AsyncTask$Status
+android.os.AsyncTask$WorkerRunnable
 android.os.Binder
 android.os.BinderProxy
 android.os.Build
@@ -471,12 +525,26 @@
 android.os.StrictMode
 android.os.StrictMode$1
 android.os.StrictMode$2
+android.os.StrictMode$3
+android.os.StrictMode$4
+android.os.StrictMode$5
+android.os.StrictMode$6
+android.os.StrictMode$7
+android.os.StrictMode$8
 android.os.StrictMode$AndroidBlockGuardPolicy
 android.os.StrictMode$AndroidBlockGuardPolicy$1
+android.os.StrictMode$AndroidCloseGuardReporter
+android.os.StrictMode$InstanceCountViolation
 android.os.StrictMode$LogStackTrace
+android.os.StrictMode$Span
 android.os.StrictMode$StrictModeDiskReadViolation
 android.os.StrictMode$StrictModeDiskWriteViolation
+android.os.StrictMode$StrictModeViolation
+android.os.StrictMode$ThreadPolicy
+android.os.StrictMode$ThreadSpanState
 android.os.StrictMode$ViolationInfo
+android.os.StrictMode$VmPolicy
+android.os.StrictMode$VmPolicy$Builder
 android.os.SystemClock
 android.os.SystemProperties
 android.os.UEventObserver
@@ -494,7 +562,6 @@
 android.server.BluetoothA2dpService
 android.server.BluetoothEventLoop
 android.server.BluetoothService
-android.telephony.PhoneNumberUtils
 android.telephony.TelephonyManager
 android.text.AndroidBidi
 android.text.AndroidCharacter
@@ -513,6 +580,7 @@
 android.text.Layout
 android.text.Layout$Alignment
 android.text.Layout$Directions
+android.text.MeasuredText
 android.text.NoCopySpan
 android.text.NoCopySpan$Concrete
 android.text.PackedIntVector
@@ -530,7 +598,7 @@
 android.text.Spanned
 android.text.SpannedString
 android.text.StaticLayout
-android.text.Styled
+android.text.TextLine
 android.text.TextPaint
 android.text.TextUtils
 android.text.TextUtils$1
@@ -540,32 +608,32 @@
 android.text.format.Time
 android.text.method.ArrowKeyMovementMethod
 android.text.method.BaseKeyListener
+android.text.method.BaseMovementMethod
 android.text.method.KeyListener
 android.text.method.MetaKeyKeyListener
 android.text.method.MovementMethod
-android.text.method.QwertyKeyListener
 android.text.method.ReplacementTransformationMethod
+android.text.method.ReplacementTransformationMethod$ReplacementCharSequence
+android.text.method.ReplacementTransformationMethod$SpannedReplacementCharSequence
 android.text.method.SingleLineTransformationMethod
 android.text.method.TextKeyListener
 android.text.method.TextKeyListener$Capitalize
 android.text.method.TransformationMethod
 android.text.style.AlignmentSpan
 android.text.style.CharacterStyle
-android.text.style.ClickableSpan
 android.text.style.LeadingMarginSpan
 android.text.style.LineBackgroundSpan
 android.text.style.LineHeightSpan
 android.text.style.MetricAffectingSpan
 android.text.style.ParagraphStyle
 android.text.style.ReplacementSpan
-android.text.style.StyleSpan
-android.text.style.URLSpan
 android.text.style.UpdateAppearance
 android.text.style.UpdateLayout
 android.text.style.WrapTogetherSpan
 android.util.AndroidException
 android.util.AndroidRuntimeException
 android.util.AttributeSet
+android.util.DebugUtils
 android.util.DisplayMetrics
 android.util.EventLog
 android.util.EventLog$Event
@@ -581,7 +649,9 @@
 android.util.Poolable
 android.util.PoolableManager
 android.util.Pools
+android.util.Singleton
 android.util.SparseArray
+android.util.SparseBooleanArray
 android.util.SparseIntArray
 android.util.StateSet
 android.util.SynchronizedPool
@@ -590,13 +660,26 @@
 android.view.AbsSavedState
 android.view.AbsSavedState$1
 android.view.AbsSavedState$2
+android.view.ActionMode
+android.view.ActionMode$Callback
 android.view.ContextMenu
 android.view.ContextMenu$ContextMenuInfo
 android.view.ContextThemeWrapper
 android.view.Display
+android.view.FallbackEventHandler
 android.view.FocusFinder
 android.view.FocusFinder$1
+android.view.FocusFinder$SequentialFocusComparator
+android.view.GLES20Canvas
+android.view.GLES20Canvas$CanvasFinalizer
 android.view.Gravity
+android.view.HardwareCanvas
+android.view.HardwareRenderer
+android.view.HardwareRenderer$Gl20Renderer
+android.view.HardwareRenderer$GlRenderer
+android.view.HardwareRenderer$GlRenderer$ComponentSizeChooser
+android.view.HardwareRenderer$GlRenderer$EglConfigChooser
+android.view.HardwareRenderer$HardwareDrawCallbacks
 android.view.IWindow
 android.view.IWindow$Stub
 android.view.IWindowManager
@@ -614,15 +697,17 @@
 android.view.InputQueue$Callback
 android.view.InputQueue$FinishedCallback
 android.view.KeyCharacterMap
-android.view.KeyCharacterMap$KeyData
+android.view.KeyCharacterMap$FallbackAction
 android.view.KeyEvent
 android.view.KeyEvent$1
 android.view.KeyEvent$Callback
 android.view.KeyEvent$DispatcherState
 android.view.LayoutInflater
 android.view.LayoutInflater$Factory
-android.view.LayoutInflater$Filter
+android.view.LayoutInflater$Factory2
 android.view.Menu
+android.view.MenuInflater
+android.view.MenuInflater$MenuState
 android.view.MenuItem
 android.view.MotionEvent
 android.view.MotionEvent$1
@@ -633,6 +718,10 @@
 android.view.SurfaceHolder$Callback
 android.view.SurfaceHolder$Callback2
 android.view.SurfaceSession
+android.view.SurfaceView
+android.view.SurfaceView$1
+android.view.SurfaceView$2
+android.view.SurfaceView$3
 android.view.VelocityTracker
 android.view.VelocityTracker$1
 android.view.VelocityTracker$Pointer
@@ -645,6 +734,8 @@
 android.view.View$MeasureSpec
 android.view.View$OnClickListener
 android.view.View$OnCreateContextMenuListener
+android.view.View$OnFocusChangeListener
+android.view.View$OnKeyListener
 android.view.View$OnLongClickListener
 android.view.View$OnTouchListener
 android.view.View$PerformClick
@@ -653,9 +744,10 @@
 android.view.ViewConfiguration
 android.view.ViewDebug
 android.view.ViewGroup
+android.view.ViewGroup$3
 android.view.ViewGroup$LayoutParams
 android.view.ViewGroup$MarginLayoutParams
-android.view.ViewGroup$OnHierarchyChangeListener
+android.view.ViewGroup$TouchTarget
 android.view.ViewManager
 android.view.ViewParent
 android.view.ViewRoot
@@ -664,11 +756,12 @@
 android.view.ViewRoot$InputMethodCallback
 android.view.ViewRoot$ResizedInfo
 android.view.ViewRoot$RunQueue
+android.view.ViewRoot$RunQueue$HandlerAction
 android.view.ViewRoot$TrackballAxis
 android.view.ViewRoot$W
+android.view.ViewStub
 android.view.ViewTreeObserver
 android.view.ViewTreeObserver$InternalInsetsInfo
-android.view.ViewTreeObserver$OnGlobalFocusChangeListener
 android.view.ViewTreeObserver$OnGlobalLayoutListener
 android.view.ViewTreeObserver$OnPreDrawListener
 android.view.ViewTreeObserver$OnScrollChangedListener
@@ -704,38 +797,36 @@
 android.view.inputmethod.EditorInfo
 android.view.inputmethod.EditorInfo$1
 android.view.inputmethod.ExtractedText
-android.view.inputmethod.ExtractedText$1
 android.view.inputmethod.ExtractedTextRequest
+android.view.inputmethod.ExtractedTextRequest$1
 android.view.inputmethod.InputConnection
 android.view.inputmethod.InputMethodManager
 android.view.inputmethod.InputMethodManager$1
 android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper
 android.view.inputmethod.InputMethodManager$H
-android.webkit.BrowserFrame
-android.webkit.GeolocationPermissions
-android.webkit.HTML5VideoViewProxy
-android.webkit.JWebCoreJavaBridge
 android.webkit.LoadListener
-android.webkit.MockGeolocation
 android.webkit.PluginManager
-android.webkit.WebBackForwardList
-android.webkit.WebHistoryItem
-android.webkit.WebIconDatabase
-android.webkit.WebSettings
-android.webkit.WebSettings$TextSize
-android.webkit.WebStorage
 android.webkit.WebView
+android.webkit.WebView$HitTestResult
 android.webkit.WebViewCore
+android.webkit.WebViewCore$TouchUpData
 android.widget.AbsListView
 android.widget.AbsListView$2
+android.widget.AbsListView$AdapterDataSetObserver
 android.widget.AbsListView$LayoutParams
+android.widget.AbsListView$OnScrollListener
 android.widget.AbsListView$RecycleBin
+android.widget.AbsListView$SavedState
+android.widget.AbsListView$SavedState$1
 android.widget.AbsSpinner
-android.widget.AbsoluteLayout
+android.widget.AbsSpinner$RecycleBin
 android.widget.Adapter
 android.widget.AdapterView
 android.widget.AdapterView$AdapterDataSetObserver
 android.widget.AdapterView$OnItemClickListener
+android.widget.AdapterView$OnItemSelectedListener
+android.widget.AdapterViewAnimator
+android.widget.ArrayAdapter
 android.widget.AutoCompleteTextView
 android.widget.BaseAdapter
 android.widget.Button
@@ -744,13 +835,14 @@
 android.widget.CompoundButton
 android.widget.EdgeGlow
 android.widget.EditText
+android.widget.ExpandableListView
+android.widget.Filter
 android.widget.Filter$FilterListener
 android.widget.Filterable
 android.widget.FrameLayout
 android.widget.FrameLayout$LayoutParams
 android.widget.Gallery
 android.widget.GridView
-android.widget.HorizontalScrollView
 android.widget.ImageButton
 android.widget.ImageView
 android.widget.ImageView$ScaleType
@@ -758,11 +850,14 @@
 android.widget.LinearLayout$LayoutParams
 android.widget.ListAdapter
 android.widget.ListPopupWindow
+android.widget.ListPopupWindow$ListSelectorHider
+android.widget.ListPopupWindow$PopupScrollListener
+android.widget.ListPopupWindow$PopupTouchInterceptor
+android.widget.ListPopupWindow$ResizePopupRunnable
 android.widget.ListView
 android.widget.ListView$ArrowScrollFocusResult
-android.widget.NumberPicker
 android.widget.OverScroller
-android.widget.OverScroller$MagneticOverScroller
+android.widget.OverScroller$SplineOverScroller
 android.widget.PopupWindow
 android.widget.PopupWindow$1
 android.widget.ProgressBar
@@ -771,41 +866,33 @@
 android.widget.RelativeLayout$DependencyGraph$Node
 android.widget.RelativeLayout$DependencyGraph$Node$1
 android.widget.RelativeLayout$LayoutParams
-android.widget.RemoteViews
-android.widget.RemoteViews$1
-android.widget.RemoteViews$Action
-android.widget.RemoteViews$ReflectionAction
+android.widget.RemoteViewsAdapter$RemoteAdapterConnectionCallback
 android.widget.ScrollBarDrawable
 android.widget.ScrollView
+android.widget.Scroller
 android.widget.SpinnerAdapter
-android.widget.TabHost
+android.widget.Switch
 android.widget.TabWidget
 android.widget.TableLayout
 android.widget.TableRow
 android.widget.TextView
 android.widget.TextView$3
-android.widget.TextView$Blink
 android.widget.TextView$BufferType
 android.widget.TextView$ChangeWatcher
 android.widget.TextView$CharWrapper
-android.widget.TextView$CursorController
 android.widget.TextView$Drawables
-android.widget.TextView$HandleView
-android.widget.TextView$InsertionPointCursorController
-android.widget.TextView$InsertionPointCursorController$1
-android.widget.TextView$SelectionModifierCursorController
-android.widget.TextView$SelectionModifierCursorController$1
-android.widget.Toast
-android.widget.Toast$TN
-android.widget.Toast$TN$1
-android.widget.Toast$TN$2
-android.widget.ViewAnimator
-android.widget.ZoomButton
-android.widget.ZoomControls
+android.widget.TextView$InputContentType
+android.widget.TextView$OnEditorActionListener
+android.widget.TextView$SavedState
+android.widget.TextView$SavedState$1
 com.android.internal.R$styleable
+com.android.internal.app.ActionBarImpl
+com.android.internal.app.ActionBarImpl$1
+com.android.internal.app.ActionBarImpl$2
+com.android.internal.app.ActionBarImpl$3
+com.android.internal.app.ActionBarImpl$4
 com.android.internal.app.AlertController
 com.android.internal.app.AlertController$1
-com.android.internal.app.AlertController$AlertParams
 com.android.internal.app.AlertController$ButtonHandler
 com.android.internal.appwidget.IAppWidgetService
 com.android.internal.appwidget.IAppWidgetService$Stub
@@ -828,11 +915,13 @@
 com.android.internal.os.ZygoteInit$MethodAndArgsCaller
 com.android.internal.policy.IPolicy
 com.android.internal.policy.PolicyManager
+com.android.internal.policy.impl.PhoneFallbackEventHandler
 com.android.internal.policy.impl.PhoneLayoutInflater
 com.android.internal.policy.impl.PhoneWindow
 com.android.internal.policy.impl.PhoneWindow$1
-com.android.internal.policy.impl.PhoneWindow$ContextMenuCallback
+com.android.internal.policy.impl.PhoneWindow$2
 com.android.internal.policy.impl.PhoneWindow$DecorView
+com.android.internal.policy.impl.PhoneWindow$DialogMenuCallback
 com.android.internal.policy.impl.PhoneWindow$PanelFeatureState
 com.android.internal.policy.impl.PhoneWindow$PanelFeatureState$SavedState
 com.android.internal.policy.impl.PhoneWindow$PanelFeatureState$SavedState$1
@@ -844,10 +933,13 @@
 com.android.internal.util.ArrayUtils
 com.android.internal.util.FastXmlSerializer
 com.android.internal.util.XmlUtils
+com.android.internal.view.BaseIWindow
 com.android.internal.view.IInputConnectionWrapper
 com.android.internal.view.IInputConnectionWrapper$MyHandler
 com.android.internal.view.IInputContext
 com.android.internal.view.IInputContext$Stub
+com.android.internal.view.IInputContextCallback
+com.android.internal.view.IInputContextCallback$Stub
 com.android.internal.view.IInputMethodCallback
 com.android.internal.view.IInputMethodCallback$Stub
 com.android.internal.view.IInputMethodClient
@@ -861,32 +953,32 @@
 com.android.internal.view.InputBindResult
 com.android.internal.view.InputBindResult$1
 com.android.internal.view.RootViewSurfaceTaker
-com.android.internal.view.menu.ContextMenuBuilder
-com.android.internal.view.menu.IconMenuItemView
-com.android.internal.view.menu.IconMenuView
+com.android.internal.view.menu.ActionMenuItem
+com.android.internal.view.menu.ActionMenuView
+com.android.internal.view.menu.ActionMenuView$1
+com.android.internal.view.menu.ActionMenuView$OverflowMenuButton
 com.android.internal.view.menu.MenuBuilder
 com.android.internal.view.menu.MenuBuilder$Callback
+com.android.internal.view.menu.MenuBuilder$ItemInvoker
+com.android.internal.view.menu.MenuBuilder$MenuType
 com.android.internal.view.menu.MenuItemImpl
-com.android.internal.view.menu.SubMenuBuilder
-com.android.internal.widget.ContactHeaderWidget
+com.android.internal.view.menu.MenuView
+com.android.internal.widget.ActionBarContainer
+com.android.internal.widget.ActionBarContextView
+com.android.internal.widget.ActionBarView
+com.android.internal.widget.ActionBarView$1
+com.android.internal.widget.ActionBarView$2
 com.android.internal.widget.DialogTitle
-com.android.internal.widget.WeightedLinearLayout
 com.android.server.Watchdog
 com.google.android.collect.Lists
 com.google.android.collect.Maps
+com.google.android.gles_jni.EGLConfigImpl
+com.google.android.gles_jni.EGLContextImpl
+com.google.android.gles_jni.EGLDisplayImpl
 com.google.android.gles_jni.EGLImpl
+com.google.android.gles_jni.EGLSurfaceImpl
 com.google.android.gles_jni.GLImpl
-com.ibm.icu4jni.charset.CharsetDecoderICU
-com.ibm.icu4jni.charset.CharsetEncoderICU
-com.ibm.icu4jni.charset.CharsetICU
-com.ibm.icu4jni.charset.NativeConverter
-com.ibm.icu4jni.common.ErrorCode
-com.ibm.icu4jni.text.NativeBreakIterator
-com.ibm.icu4jni.text.NativeCollation
-com.ibm.icu4jni.text.NativeDecimalFormat
-com.ibm.icu4jni.text.NativeDecimalFormat$FieldPositionIterator
-com.ibm.icu4jni.util.ICU
-com.ibm.icu4jni.util.LocaleData
+com.google.i18n.phonenumbers.PhoneNumberUtil
 dalvik.system.BlockGuard
 dalvik.system.BlockGuard$1
 dalvik.system.BlockGuard$2
@@ -894,6 +986,9 @@
 dalvik.system.BlockGuard$Policy
 dalvik.system.BlockGuard$WrappedFileSystem
 dalvik.system.BlockGuard$WrappedNetworkSystem
+dalvik.system.CloseGuard
+dalvik.system.CloseGuard$DefaultReporter
+dalvik.system.CloseGuard$Reporter
 dalvik.system.DalvikLogHandler
 dalvik.system.DalvikLogging
 dalvik.system.DexFile
@@ -905,7 +1000,6 @@
 dalvik.system.VMStack
 dalvik.system.Zygote
 java.beans.PropertyChangeEvent
-java.beans.PropertyChangeListener
 java.beans.PropertyChangeSupport
 java.io.BufferedInputStream
 java.io.BufferedReader
@@ -929,12 +1023,7 @@
 java.io.InputStream
 java.io.InputStreamReader
 java.io.InterruptedIOException
-java.io.ObjectInput
-java.io.ObjectInputStream
-java.io.ObjectOutput
-java.io.ObjectOutputStream
 java.io.ObjectStreamClass
-java.io.ObjectStreamConstants
 java.io.ObjectStreamField
 java.io.OutputStream
 java.io.OutputStreamWriter
@@ -955,10 +1044,10 @@
 java.lang.CaseMapper
 java.lang.CharSequence
 java.lang.Character
-java.lang.Character$UnicodeBlock
 java.lang.Class
 java.lang.ClassCache
 java.lang.ClassCache$EnumComparator
+java.lang.ClassCastException
 java.lang.ClassLoader
 java.lang.ClassLoader$SystemClassLoader
 java.lang.ClassNotFoundException
@@ -968,6 +1057,7 @@
 java.lang.Enum
 java.lang.Error
 java.lang.Exception
+java.lang.ExceptionInInitializerError
 java.lang.Float
 java.lang.IllegalArgumentException
 java.lang.IllegalStateException
@@ -984,7 +1074,6 @@
 java.lang.Math
 java.lang.NoClassDefFoundError
 java.lang.NoSuchMethodException
-java.lang.NullPointerException
 java.lang.Number
 java.lang.NumberFormatException
 java.lang.Object
@@ -1011,8 +1100,6 @@
 java.lang.Thread$State
 java.lang.Thread$UncaughtExceptionHandler
 java.lang.ThreadGroup
-java.lang.ThreadGroup$ChildrenGroupsLock
-java.lang.ThreadGroup$ChildrenThreadsLock
 java.lang.ThreadLocal
 java.lang.ThreadLocal$Values
 java.lang.Throwable
@@ -1065,9 +1152,12 @@
 java.net.NetPermission
 java.net.NetworkInterface
 java.net.Proxy
+java.net.Proxy$Type
+java.net.ProxySelector
+java.net.ProxySelectorImpl
 java.net.Socket
-java.net.Socket$ConnectLock
 java.net.SocketAddress
+java.net.SocketException
 java.net.SocketImpl
 java.net.SocketImplFactory
 java.net.SocketOptions
@@ -1077,27 +1167,25 @@
 java.net.URL
 java.net.URLConnection
 java.net.URLConnection$DefaultContentHandler
+java.net.URLEncoder
 java.net.URLStreamHandler
-java.net.UnknownHostException
 java.nio.BaseByteBuffer
 java.nio.Buffer
-java.nio.BufferFactory
 java.nio.ByteBuffer
 java.nio.ByteOrder
 java.nio.CharArrayBuffer
 java.nio.CharBuffer
 java.nio.CharSequenceAdapter
 java.nio.DirectByteBuffer
-java.nio.DirectByteBuffer$SafeAddress
+java.nio.FileChannelImpl
+java.nio.FileChannelImpl$1
 java.nio.HeapByteBuffer
-java.nio.MappedByteBuffer
-java.nio.MappedByteBufferAdapter
 java.nio.NIOAccess
-java.nio.ReadOnlyDirectByteBuffer
+java.nio.NioUtils
 java.nio.ReadWriteCharArrayBuffer
 java.nio.ReadWriteDirectByteBuffer
 java.nio.ReadWriteHeapByteBuffer
-java.nio.ShortToByteBufferAdapter
+java.nio.WriteOnlyFileChannel
 java.nio.channels.ByteChannel
 java.nio.channels.Channel
 java.nio.channels.FileChannel
@@ -1121,6 +1209,7 @@
 java.security.AccessController
 java.security.BasicPermission
 java.security.Guard
+java.security.Key
 java.security.KeyStore
 java.security.KeyStore$1
 java.security.KeyStoreSpi
@@ -1147,6 +1236,7 @@
 java.security.cert.TrustAnchor
 java.security.cert.X509Certificate
 java.security.cert.X509Extension
+java.security.spec.KeySpec
 java.text.DateFormat
 java.text.DateFormatSymbols
 java.text.DecimalFormat
@@ -1164,6 +1254,7 @@
 java.util.AbstractQueue
 java.util.AbstractSequentialList
 java.util.AbstractSet
+java.util.ArrayDeque
 java.util.ArrayList
 java.util.ArrayList$ArrayListIterator
 java.util.Arrays
@@ -1175,6 +1266,7 @@
 java.util.Collections$EmptyList
 java.util.Collections$EmptyMap
 java.util.Collections$EmptySet
+java.util.Collections$SingletonList
 java.util.Collections$UnmodifiableCollection
 java.util.Collections$UnmodifiableCollection$1
 java.util.Collections$UnmodifiableList
@@ -1190,7 +1282,6 @@
 java.util.EnumMap
 java.util.EnumSet
 java.util.Enumeration
-java.util.EventListener
 java.util.EventObject
 java.util.Formattable
 java.util.Formatter
@@ -1253,8 +1344,6 @@
 java.util.TreeMap$Bound$3
 java.util.TreeMap$EntrySet
 java.util.TreeMap$EntrySet$1
-java.util.TreeMap$KeySet
-java.util.TreeMap$KeySet$1
 java.util.TreeMap$MapIterator
 java.util.TreeMap$Node
 java.util.TreeMap$Relation
@@ -1263,14 +1352,13 @@
 java.util.Vector$1
 java.util.WeakHashMap
 java.util.WeakHashMap$Entry
-java.util.WeakHashMap$Entry$Type
-java.util.WeakHashMap$HashIterator
 java.util.concurrent.AbstractExecutorService
 java.util.concurrent.BlockingQueue
 java.util.concurrent.Callable
 java.util.concurrent.ConcurrentLinkedQueue
 java.util.concurrent.ConcurrentLinkedQueue$Node
 java.util.concurrent.CopyOnWriteArrayList
+java.util.concurrent.CopyOnWriteArrayList$CowIterator
 java.util.concurrent.CountDownLatch
 java.util.concurrent.CountDownLatch$Sync
 java.util.concurrent.Executor
@@ -1298,7 +1386,9 @@
 java.util.concurrent.TimeUnit$5
 java.util.concurrent.TimeUnit$6
 java.util.concurrent.TimeUnit$7
+java.util.concurrent.atomic.AtomicBoolean
 java.util.concurrent.atomic.AtomicInteger
+java.util.concurrent.atomic.AtomicReference
 java.util.concurrent.atomic.UnsafeAccess
 java.util.concurrent.locks.AbstractOwnableSynchronizer
 java.util.concurrent.locks.AbstractQueuedSynchronizer
@@ -1307,10 +1397,16 @@
 java.util.concurrent.locks.Condition
 java.util.concurrent.locks.Lock
 java.util.concurrent.locks.LockSupport
+java.util.concurrent.locks.ReadWriteLock
 java.util.concurrent.locks.ReentrantLock
 java.util.concurrent.locks.ReentrantLock$FairSync
 java.util.concurrent.locks.ReentrantLock$NonfairSync
 java.util.concurrent.locks.ReentrantLock$Sync
+java.util.concurrent.locks.ReentrantReadWriteLock
+java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock
+java.util.concurrent.locks.ReentrantReadWriteLock$Sync
+java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter
+java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock
 java.util.concurrent.locks.UnsafeAccess
 java.util.jar.Attributes
 java.util.jar.Attributes$Name
@@ -1344,18 +1440,20 @@
 java.util.zip.CRC32
 java.util.zip.Checksum
 java.util.zip.Deflater
-java.util.zip.GZIPInputStream
 java.util.zip.Inflater
 java.util.zip.InflaterInputStream
 java.util.zip.ZipConstants
 java.util.zip.ZipEntry
-java.util.zip.ZipEntry$LittleEndianReader
 java.util.zip.ZipFile
 java.util.zip.ZipFile$2
 java.util.zip.ZipFile$RAFStream
 java.util.zip.ZipFile$ZipInflaterInputStream
 javax.microedition.khronos.egl.EGL
 javax.microedition.khronos.egl.EGL10
+javax.microedition.khronos.egl.EGLConfig
+javax.microedition.khronos.egl.EGLContext
+javax.microedition.khronos.egl.EGLDisplay
+javax.microedition.khronos.egl.EGLSurface
 javax.microedition.khronos.opengles.GL
 javax.microedition.khronos.opengles.GL10
 javax.microedition.khronos.opengles.GL10Ext
@@ -1383,13 +1481,36 @@
 javax.net.ssl.X509KeyManager
 javax.net.ssl.X509TrustManager
 javax.security.auth.x500.X500Principal
+libcore.base.CollectionUtils
+libcore.base.CollectionUtils$1
+libcore.base.CollectionUtils$1$1
+libcore.base.EmptyArray
 libcore.base.Objects
+libcore.base.Streams
+libcore.icu.CharsetDecoderICU
+libcore.icu.CharsetEncoderICU
+libcore.icu.CharsetICU
+libcore.icu.ErrorCode
+libcore.icu.ICU
+libcore.icu.LocaleData
+libcore.icu.NativeBreakIterator
+libcore.icu.NativeCollation
+libcore.icu.NativeConverter
+libcore.icu.NativeDecimalFormat
+libcore.icu.NativeDecimalFormat$FieldPositionIterator
 libcore.icu.NativeIDN
 libcore.icu.NativeNormalizer
 libcore.icu.NativePluralRules
 libcore.icu.TimeZones
 libcore.icu.TimeZones$CachedTimeZones
+libcore.io.BufferIterator
+libcore.io.HeapBufferIterator
 libcore.io.IoUtils
+libcore.io.MemoryMappedFile
+libcore.io.NioBufferIterator
+libcore.math.MathUtils
+libcore.net.MimeUtils
+libcore.net.RawSocket
 org.apache.commons.logging.Log
 org.apache.commons.logging.LogFactory
 org.apache.commons.logging.impl.Jdk14Logger
@@ -1416,19 +1537,12 @@
 org.apache.harmony.luni.net.SocketOutputStream
 org.apache.harmony.luni.platform.IFileSystem
 org.apache.harmony.luni.platform.INetworkSystem
-org.apache.harmony.luni.platform.MappedPlatformAddress
 org.apache.harmony.luni.platform.OSFileSystem
 org.apache.harmony.luni.platform.OSMemory
 org.apache.harmony.luni.platform.OSNetworkSystem
 org.apache.harmony.luni.platform.Platform
-org.apache.harmony.luni.platform.PlatformAddress
-org.apache.harmony.luni.platform.PlatformAddressFactory
-org.apache.harmony.luni.platform.RuntimeMemorySpy
-org.apache.harmony.luni.platform.RuntimeMemorySpy$AddressWrapper
 org.apache.harmony.luni.util.FloatingPointParser
-org.apache.harmony.luni.util.InputStreamHelper
-org.apache.harmony.luni.util.InputStreamHelper$1
-org.apache.harmony.luni.util.InputStreamHelper$ExposedByteArrayInputStream
+org.apache.harmony.luni.util.FloatingPointParser$StringExponentPair
 org.apache.harmony.luni.util.PriviAction
 org.apache.harmony.luni.util.TwoKeyHashMap
 org.apache.harmony.luni.util.TwoKeyHashMap$Entry
@@ -1436,15 +1550,6 @@
 org.apache.harmony.luni.util.TwoKeyHashMap$ValueIteratorImpl
 org.apache.harmony.luni.util.TwoKeyHashMap$ValuesCollectionImpl
 org.apache.harmony.luni.util.Util
-org.apache.harmony.nio.FileChannelFactory
-org.apache.harmony.nio.internal.DirectBuffer
-org.apache.harmony.nio.internal.FileChannelImpl
-org.apache.harmony.nio.internal.FileLockImpl
-org.apache.harmony.nio.internal.FileChannelImpl$RepositioningLock
-org.apache.harmony.nio.internal.LockManager
-org.apache.harmony.nio.internal.LockManager$1
-org.apache.harmony.nio.internal.ReadOnlyFileChannel
-org.apache.harmony.nio.internal.WriteOnlyFileChannel
 org.apache.harmony.security.Util
 org.apache.harmony.security.asn1.ASN1Any
 org.apache.harmony.security.asn1.ASN1Choice
@@ -1470,6 +1575,8 @@
 org.apache.harmony.security.asn1.BerInputStream
 org.apache.harmony.security.asn1.DerInputStream
 org.apache.harmony.security.fortress.Engine
+org.apache.harmony.security.fortress.Engine$ServiceCacheEntry
+org.apache.harmony.security.fortress.Engine$SpiAndProvider
 org.apache.harmony.security.fortress.SecurityAccess
 org.apache.harmony.security.fortress.SecurityUtils
 org.apache.harmony.security.fortress.Services
@@ -1520,7 +1627,6 @@
 org.apache.harmony.xnet.provider.jsse.ClientSessionContext
 org.apache.harmony.xnet.provider.jsse.DefaultSSLContextImpl
 org.apache.harmony.xnet.provider.jsse.IndexedPKIXParameters
-org.apache.harmony.xnet.provider.jsse.IndexedPKIXParameters$Bytes
 org.apache.harmony.xnet.provider.jsse.JSSEProvider
 org.apache.harmony.xnet.provider.jsse.JSSEProvider$1
 org.apache.harmony.xnet.provider.jsse.KeyManagerFactoryImpl
@@ -1543,7 +1649,6 @@
 org.apache.http.ConnectionReuseStrategy
 org.apache.http.FormattedHeader
 org.apache.http.Header
-org.apache.http.HeaderElement
 org.apache.http.HeaderElementIterator
 org.apache.http.HeaderIterator
 org.apache.http.HttpClientConnection
@@ -1560,7 +1665,6 @@
 org.apache.http.HttpResponseFactory
 org.apache.http.HttpResponseInterceptor
 org.apache.http.HttpVersion
-org.apache.http.NameValuePair
 org.apache.http.ProtocolVersion
 org.apache.http.ReasonPhraseCatalog
 org.apache.http.RequestLine
@@ -1577,8 +1681,6 @@
 org.apache.http.client.ResponseHandler
 org.apache.http.client.UserTokenHandler
 org.apache.http.client.methods.AbortableHttpRequest
-org.apache.http.client.methods.HttpEntityEnclosingRequestBase
-org.apache.http.client.methods.HttpPost
 org.apache.http.client.methods.HttpRequestBase
 org.apache.http.client.methods.HttpUriRequest
 org.apache.http.client.params.HttpClientParams
@@ -1650,7 +1752,6 @@
 org.apache.http.impl.client.DefaultRequestDirector
 org.apache.http.impl.client.DefaultTargetAuthenticationHandler
 org.apache.http.impl.client.DefaultUserTokenHandler
-org.apache.http.impl.client.EntityEnclosingRequestWrapper
 org.apache.http.impl.client.RequestWrapper
 org.apache.http.impl.client.RoutedRequest
 org.apache.http.impl.conn.AbstractClientConnAdapter
@@ -1658,10 +1759,11 @@
 org.apache.http.impl.conn.AbstractPooledConnAdapter
 org.apache.http.impl.conn.DefaultClientConnection
 org.apache.http.impl.conn.DefaultClientConnectionOperator
-org.apache.http.impl.conn.DefaultHttpRoutePlanner
 org.apache.http.impl.conn.DefaultResponseParser
 org.apache.http.impl.conn.IdleConnectionHandler
 org.apache.http.impl.conn.IdleConnectionHandler$TimeValues
+org.apache.http.impl.conn.ProxySelectorRoutePlanner
+org.apache.http.impl.conn.ProxySelectorRoutePlanner$1
 org.apache.http.impl.conn.tsccm.AbstractConnPool
 org.apache.http.impl.conn.tsccm.BasicPoolEntry
 org.apache.http.impl.conn.tsccm.BasicPoolEntryRef
@@ -1689,7 +1791,6 @@
 org.apache.http.impl.io.AbstractSessionInputBuffer
 org.apache.http.impl.io.AbstractSessionOutputBuffer
 org.apache.http.impl.io.ContentLengthInputStream
-org.apache.http.impl.io.ContentLengthOutputStream
 org.apache.http.impl.io.HttpRequestWriter
 org.apache.http.impl.io.HttpTransportMetricsImpl
 org.apache.http.impl.io.SocketInputBuffer
@@ -1701,14 +1802,12 @@
 org.apache.http.io.SessionOutputBuffer
 org.apache.http.message.AbstractHttpMessage
 org.apache.http.message.BasicHeader
-org.apache.http.message.BasicHeaderElement
 org.apache.http.message.BasicHeaderElementIterator
 org.apache.http.message.BasicHeaderValueParser
 org.apache.http.message.BasicHttpResponse
 org.apache.http.message.BasicLineFormatter
 org.apache.http.message.BasicLineParser
 org.apache.http.message.BasicListHeaderIterator
-org.apache.http.message.BasicNameValuePair
 org.apache.http.message.BasicRequestLine
 org.apache.http.message.BasicStatusLine
 org.apache.http.message.BufferedHeader
@@ -1803,12 +1902,12 @@
 org.bouncycastle.asn1.x509.X509Name
 org.bouncycastle.asn1.x509.X509NameElementList
 org.bouncycastle.asn1.x509.X509ObjectIdentifiers
+org.bouncycastle.asn1.x9.X9ObjectIdentifiers
 org.bouncycastle.crypto.Digest
 org.bouncycastle.crypto.ExtendedDigest
 org.bouncycastle.crypto.Mac
 org.bouncycastle.crypto.digests.OpenSSLDigest
 org.bouncycastle.crypto.digests.OpenSSLDigest$SHA1
-org.bouncycastle.crypto.engines.AESFastEngine
 org.bouncycastle.crypto.macs.HMac
 org.bouncycastle.jce.ProviderConfigurationPermission
 org.bouncycastle.jce.interfaces.BCKeyStore
@@ -1824,10 +1923,10 @@
 org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi
 org.bouncycastle.jce.provider.ProviderUtil
 org.bouncycastle.jce.provider.X509CertificateObject
+org.bouncycastle.jce.provider.asymmetric.ECMappings
 org.bouncycastle.jce.provider.symmetric.AESMappings
 org.bouncycastle.util.Strings
 org.bouncycastle.util.io.Streams
-org.ccil.cowan.tagsoup.Parser
 org.xml.sax.Attributes
 org.xml.sax.ContentHandler
 org.xml.sax.Locator
diff --git a/tools/preload/Record.java b/tools/preload/Record.java
index 9d45a26..2f2ffaf 100644
--- a/tools/preload/Record.java
+++ b/tools/preload/Record.java
@@ -30,6 +30,8 @@
             "com.google.android.apps.maps\\u003Adriveabout",
             "com.google.android.apps.maps:LocationFriendService",
             "com.google.android.apps.maps\\u003ALocationFriendService",
+            "com.google.android.apps.maps:NetworkLocationService",
+            "com.google.android.apps.maps\\u003ANetworkLocationService",
     };
 
     enum Type {
@@ -69,7 +71,7 @@
 
     /** Record time (ns). */
     final long time;
-    
+
     /** Source file line# */
     int sourceLineNumber;
 
@@ -91,7 +93,7 @@
         for (int i = 0; i < REPLACE_CLASSES.length; i+= 2) {
             line = line.replace(REPLACE_CLASSES[i], REPLACE_CLASSES[i+1]);
         }
-        
+
         line = line.substring(1);
         String[] parts = line.split(":");
 
@@ -106,12 +108,12 @@
 
         time = Long.parseLong(parts[6]);
     }
-    
+
     /**
      * Decode any escaping that may have been written to the log line.
-     * 
+     *
      * Supports unicode-style escaping:  \\uXXXX = character in hex
-     * 
+     *
      * @param rawField the field as it was written into the log
      * @result the same field with any escaped characters replaced
      */
@@ -122,11 +124,11 @@
             String before = result.substring(0, offset);
             String escaped = result.substring(offset+2, offset+6);
             String after = result.substring(offset+6);
-            
+
             result = String.format("%s%c%s", before, Integer.parseInt(escaped, 16), after);
 
-            // find another but don't recurse  
-            offset = result.indexOf("\\u", offset + 1);          
+            // find another but don't recurse
+            offset = result.indexOf("\\u", offset + 1);
         }
         return result;
     }
@@ -135,13 +137,13 @@
      * Converts a VM-style name to a language-style name.
      */
     String vmTypeToLanguage(String typeName) {
-        // if the typename is (null), just return it as-is.  This is probably in dexopt and 
+        // if the typename is (null), just return it as-is.  This is probably in dexopt and
         // will be discarded anyway.  NOTE: This corresponds to the case in dalvik/vm/oo/Class.c
         // where dvmLinkClass() returns false and we clean up and exit.
         if ("(null)".equals(typeName)) {
             return typeName;
         }
-        
+
         if (!typeName.startsWith("L") || !typeName.endsWith(";") ) {
             throw new AssertionError("Bad name: " + typeName + " in line " + sourceLineNumber);
         }