Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"