Merge "Track libcore change 336ffbe1f2870fef47f8e80da87c80d7e379b69c"