am 6a1c0059: am 2fed6caf: Merge "Libcore.os has moved to android.system.Os."

* commit '6a1c0059b11c1e4459875beb81f0bf78ed6aa746':
  Libcore.os has moved to android.system.Os.
tree: 08aef59e092dfb94ed9f49f103f6ee95edd10d6a
  1. tests/