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

* commit '2fed6caf1a2fda1783116b9c3749d4e365fdd787':
  Libcore.os has moved to android.system.Os.
tree: fdb6eb5521e7cb7f88685022cff686bd4649d058
  1. tests/