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

Change-Id: Ic746f92f0d23c5ef8b072d84e2f0d8c075dfeb89