am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os."

* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.