Merge "Track libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab"
am: 412dfe23dc

* commit '412dfe23dcfd7bdae13e8e0b1dcf6c7daaf8e623':
  Track libcore change c9b5ffc066d5ea92fdbf0cfd7ea7f56a6e96a4ab