Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: faaa80e1 am: 70d4d8bb am: 189e7c20 am: 06a8e0ee Change-Id: I7be3474ab594980b3561f8db0dfed50a53aee604