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

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100