am 761e39e1: Merge "Switch to using android.system.Os for more calls"

* commit '761e39e18990b657c488c78a6c048f625bd6b74a':
  Switch to using android.system.Os for more calls