Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68"
am: 937abc9

* commit '937abc9dba5b4a1f74739d1b9b0701450364c92b':
  Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68

Change-Id: Ic029ef32de41812b3decf2e1b8a9d0d42604214e