Merge "Track libcore commit 05f9ecbe6d0a41aaf71a1601f2a3d07218bc487c"