Move expect declarations to the appropriate packages

So that they match actual declarations in Kotlin/JVM stdlib.

libraries/stdlib/common/src/kotlin/CollectionsH.kt

@@ -167,3 +167,8 @@ public expect fun <T, K> Grouping<T, K>.eachCount(): Map<K, Int>
 internal expect fun copyToArrayImpl(collection: Collection<*>): Array<Any?>
 
 internal expect fun <T> copyToArrayImpl(collection: Collection<*>, array: Array<T>): Array<T>
+
+internal expect fun <T> arrayOfNulls(reference: Array<T>, size: Int): Array<T>
+internal expect fun <K, V> Map<K, V>.toSingletonMapOrSelf(): Map<K, V>
+internal expect fun <K, V> Map<out K, V>.toSingletonMap(): Map<K, V>
+internal expect fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array<out Any?>

libraries/stdlib/common/src/kotlin/ConsoleH.kt

@@ -1,11 +0,0 @@
-package kotlin.io
-
-
-/** Prints a newline to the standard output stream. */
-public expect fun println()
-
-/** Prints the given message and newline to the standard output stream. */
-public expect fun println(message: Any?)
-
-/** Prints the given message to the standard output stream. */
-public expect fun print(message: Any?)

libraries/stdlib/common/src/kotlin/JvmAnnotationsH.kt

@@ -25,3 +25,6 @@ expect annotation class JvmName(val name: String)
 expect annotation class JvmMultifileClass()
 
 expect annotation class JvmField()
+
+@Target(FIELD)
+expect annotation class Volatile()

libraries/stdlib/common/src/kotlin/KotlinH.kt

@@ -74,12 +74,7 @@ expect inline fun <T> Comparator(crossinline comparison: (a: T, b: T) -> Int): C
 
 // From kotlin.kt
 
-internal expect fun <T> arrayOfNulls(reference: Array<out T>, size: Int): Array<T>
-internal inline expect fun <K, V> Map<K, V>.toSingletonMapOrSelf(): Map<K, V>
-internal inline expect fun <K, V> Map<out K, V>.toSingletonMap(): Map<K, V>
-internal inline expect fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array<out Any?>
 
-internal expect interface Serializable
 
 // From numbers.kt
 
@@ -135,8 +130,8 @@ public expect fun Float.Companion.fromBits(bits: Int): Float
 
 // From concurrent.kt
 
-@Target(PROPERTY, FIELD)
-expect annotation class Volatile()
+@Deprecated("Use Volatile annotation from kotlin.jvm package", ReplaceWith("kotlin.jvm.Volatile"), level = DeprecationLevel.WARNING)
+public typealias Volatile = kotlin.jvm.Volatile
 
 public expect inline fun <R> synchronized(lock: Any, block: () -> R): R
 

libraries/stdlib/common/src/kotlin/ioH.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.io
+
+
+/** Prints a newline to the standard output stream. */
+public expect fun println()
+
+/** Prints the given message and newline to the standard output stream. */
+public expect fun println(message: Any?)
+
+/** Prints the given message to the standard output stream. */
+public expect fun print(message: Any?)
+
+
+internal expect interface Serializable