Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6

Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f

Android.mk

@@ -301,34 +301,14 @@ fwbase_dirs_to_document += core/config/sdk
 # Intentionally not included from libcore:
 #     icu openssl suncompat support
 libcore_to_document := \
-	annotation/src/main/java/java \
-	archive/src/main/java/java \
-	auth/src/main/java/javax \
-	awt-kernel/src/main/java/java \
-	concurrent/src/main/java \
-	crypto/src/main/java/javax \
 	dalvik/src/main/java/dalvik \
 	json/src/main/java \
 	junit/src/main/java \
-	logging/src/main/java/java \
 	luni/src/main/java/java \
-	luni-kernel/src/main/java/java \
-	math/src/main/java/java \
-	nio/src/main/java/java \
-	nio_char/src/main/java/java \
-	prefs/src/main/java/java \
-	regex/src/main/java/java \
-	security/src/main/java/java \
-	security/src/main/java/javax \
-	security-kernel/src/main/java/java \
-	sql/src/main/java/java \
-	sql/src/main/java/javax \
-	text/src/main/java/java \
-	x-net/src/main/java/javax \
-	xml/src/main/java/javax \
-	xml/src/main/java/org/xml/sax \
+	luni/src/main/java/javax \
+	luni/src/main/java/org/xml/sax \
+	luni/src/main/java/org/w3c \
 	xml/src/main/java/org/xmlpull/v1 \
-	xml/src/main/java/org/w3c
 
 non_base_dirs := \
 	../../external/apache-http/src/org/apache/http

preloaded-classes

@@ -693,7 +693,6 @@ 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.CharsetProviderICU
 com.ibm.icu4jni.charset.NativeConverter
 com.ibm.icu4jni.common.ErrorCode
 com.ibm.icu4jni.lang.UCharacter
@@ -703,9 +702,6 @@ com.ibm.icu4jni.text.NativeBreakIterator
 com.ibm.icu4jni.text.NativeCollation
 com.ibm.icu4jni.text.NativeDecimalFormat
 com.ibm.icu4jni.text.RuleBasedCollator
-com.ibm.icu4jni.text.RuleBasedNumberFormat
-com.ibm.icu4jni.util.Resources
-com.ibm.icu4jni.util.Resources$DefaultTimeZones
 dalvik.system.DalvikLogHandler
 dalvik.system.DalvikLogging
 dalvik.system.NativeStart
@@ -754,7 +750,6 @@ java.io.PrintStream
 java.io.PrintWriter
 java.io.PushbackReader
 java.io.RandomAccessFile
-java.io.RandomAccessFile$RepositionLock
 java.io.Reader
 java.io.Serializable
 java.io.StreamCorruptedException
@@ -926,7 +921,6 @@ java.security.Security
 java.security.cert.X509Certificate
 java.text.AttributedCharacterIterator$Attribute
 java.text.Collator
-java.text.Collator$1
 java.text.DateFormat
 java.text.DateFormat$Field
 java.text.DecimalFormat