am 36a70559: am 2fed6caf: Merge "Libcore.os has moved to android.system.Os."

* commit '36a7055992438d2ea46c256d63ce357f0afa8c5f':
  Libcore.os has moved to android.system.Os.