Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4
am: 40dfadda77

Change-Id: I8b74cd195f4133e478a63ad2066856ebe32b6231