Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b" am: 443af115ab
am: 9bc30db050

Change-Id: Ie42033e6d1634bfe6168d5b1e20e1dc26882f6c9