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

* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.