resolved conflicts for merge of cd6e3484 to master

diff --cc preloaded-classes
index 1a92546,dc5327e..1791e39
--- 1/preloaded-classes
--- 2/preloaded-classes
+++ b/preloaded-classes
@@@ -220,11 -432,11 +220,12 @@@ android.net.LocalSocketImpl$SocketOutpu
  android.net.NetworkConnectivityListener$State
  android.net.NetworkInfo
  android.net.NetworkInfo$DetailedState
 -android.net.NetworkInfo$State
 -android.net.NetworkUtils
 +android.net.SSLCertificateSocketFactory
+ android.net.TrafficStats
  android.net.Uri
 +android.net.Uri$1
 +android.net.Uri$AbstractHierarchicalUri
 +android.net.Uri$AbstractPart
  android.net.Uri$HierarchicalUri
  android.net.Uri$OpaqueUri
  android.net.Uri$Part