Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"
am: 443af115ab

Change-Id: Id3eed59b96b9aba2f101bb3910f7eace84a6699e