Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"