Merge "Track libcore commit cf86f3319e738c76c5e97ad95bb8a4e30654a787"