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

Change-Id: I74a0d7f3623bb1e6fdf6142a702c0e5dcfe1d5ee