Merge "Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362."