Merge "Track libcore change 7f8ab8179829c1eb74ff785d55f24e09f560662e"