resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp

Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b

diff --cc core/java/com/android/internal/os/KernelCpuSpeedReader.java
index 757a112,ae13ea4..4c0370c
--- 1/core/java/com/android/internal/os/KernelCpuSpeedReader.java
--- 2/core/java/com/android/internal/os/KernelCpuSpeedReader.java
+++ b/core/java/com/android/internal/os/KernelCpuSpeedReader.java
@@@ -51,9 -50,9 +50,9 @@@ public class KernelCpuSpeedReader 
      public KernelCpuSpeedReader(int cpuNumber, int numSpeedSteps) {
          mProcFile = String.format("/sys/devices/system/cpu/cpu%d/cpufreq/stats/time_in_state",
                  cpuNumber);
 -        mLastSpeedTimes = new long[numSpeedSteps];
 -        mDeltaSpeedTimes = new long[numSpeedSteps];
 +        mLastSpeedTimesMs = new long[numSpeedSteps];
 +        mDeltaSpeedTimesMs = new long[numSpeedSteps];
-         long jiffyHz = Libcore.os.sysconf(OsConstants._SC_CLK_TCK);
+         long jiffyHz = Os.sysconf(OsConstants._SC_CLK_TCK);
          mJiffyMillis = 1000/jiffyHz;
      }
  

diff --cc media/java/android/media/MediaPlayer.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageInstallerSession.java
index 07bb3c5,a4fb98d..bf86300
--- 1/services/core/java/com/android/server/pm/PackageInstallerSession.java
--- 2/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@@ -95,12 -78,7 +95,11 @@@ import com.android.server.pm.Installer.
  import com.android.server.pm.PackageInstallerService.PackageInstallObserverAdapter;
  
  import libcore.io.IoUtils;
- import libcore.io.Libcore;
  
 +import org.xmlpull.v1.XmlPullParser;
 +import org.xmlpull.v1.XmlPullParserException;
 +import org.xmlpull.v1.XmlSerializer;
 +
  import java.io.File;
  import java.io.FileDescriptor;
  import java.io.FileFilter;
@@@ -650,9 -513,11 +649,9 @@@ public class PackageInstallerSession ex
              if (!FileUtils.isValidExtFilename(name)) {
                  throw new IllegalArgumentException("Invalid name: " + name);
              }
 -            final File target = new File(resolveStageDir(), name);
 -
 +            final File target = new File(resolveStageDirLocked(), name);
-             final FileDescriptor targetFd = Libcore.os.open(target.getAbsolutePath(), O_RDONLY, 0);
+             final FileDescriptor targetFd = Os.open(target.getAbsolutePath(), O_RDONLY, 0);
              return new ParcelFileDescriptor(targetFd);
 -
          } catch (ErrnoException e) {
              throw e.rethrowAsIOException();
          }

diff --cc services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
Simple merge