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

Change-Id: Ib6e3e7184acc555295e9efd2a51c8744f80c9099